pidgin/quail/quail

Fix merge
soc.2013.phil.quail
2013-06-29, Phil Hannent
c4d3373fc63c
Parents 9ff7992b5427
Children c6d0ee53e238
Fix merge
6 files changed, 197 insertions(+), 78 deletions(-)
  • +19 -0
    aboutwindow.cpp
  • +28 -0
    aboutwindow.h
  • +55 -0
    aboutwindow.ui
  • +13 -1
    mainwindow.cpp
  • +5 -0
    mainwindow.h
  • +77 -77
    quail.pro
    • --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/aboutwindow.cpp Sat Jun 29 07:55:53 2013 +0100
    @@ -0,0 +1,19 @@
    +#include "aboutwindow.h"
    +#include "ui_aboutwindow.h"
    +
    +AboutWindow::AboutWindow(QWidget *parent) :
    + QDialog(parent),
    + ui(new Ui::AboutWindow)
    +{
    + ui->setupUi(this);
    +}
    +
    +AboutWindow::~AboutWindow()
    +{
    + delete ui;
    +}
    +
    +void AboutWindow::on_btnClose_clicked()
    +{
    + close();
    +}
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/aboutwindow.h Sat Jun 29 07:55:53 2013 +0100
    @@ -0,0 +1,28 @@
    +#ifndef ABOUTWINDOW_H
    +#define ABOUTWINDOW_H
    +
    +#include <QDialog>
    +
    +namespace Ui {
    +class AboutWindow;
    +}
    +
    +class AboutWindow : public QDialog
    +{
    + Q_OBJECT
    +
    +public:
    + explicit AboutWindow(QWidget *parent = 0);
    + ~AboutWindow();
    +
    +public slots:
    + void slotSetText(QString txt);
    +
    +private slots:
    + void on_btnClose_clicked();
    +
    +private:
    + Ui::AboutWindow *ui;
    +};
    +
    +#endif // ABOUTWINDOW_H
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/aboutwindow.ui Sat Jun 29 07:55:53 2013 +0100
    @@ -0,0 +1,55 @@
    +<?xml version="1.0" encoding="UTF-8"?>
    +<ui version="4.0">
    + <class>AboutWindow</class>
    + <widget class="QDialog" name="AboutWindow">
    + <property name="geometry">
    + <rect>
    + <x>0</x>
    + <y>0</y>
    + <width>400</width>
    + <height>300</height>
    + </rect>
    + </property>
    + <property name="windowTitle">
    + <string>Dialog</string>
    + </property>
    + <layout class="QVBoxLayout" name="verticalLayout">
    + <item>
    + <widget class="QLabel" name="lblTitle">
    + <property name="text">
    + <string>TextLabel</string>
    + </property>
    + </widget>
    + </item>
    + <item>
    + <widget class="QGraphicsView" name="gvOutput"/>
    + </item>
    + <item>
    + <layout class="QHBoxLayout" name="horizontalLayout">
    + <item>
    + <spacer name="horizontalSpacer">
    + <property name="orientation">
    + <enum>Qt::Horizontal</enum>
    + </property>
    + <property name="sizeHint" stdset="0">
    + <size>
    + <width>40</width>
    + <height>20</height>
    + </size>
    + </property>
    + </spacer>
    + </item>
    + <item>
    + <widget class="QPushButton" name="btnClose">
    + <property name="text">
    + <string>Close</string>
    + </property>
    + </widget>
    + </item>
    + </layout>
    + </item>
    + </layout>
    + </widget>
    + <resources/>
    + <connections/>
    +</ui>
    --- a/mainwindow.cpp Fri Jun 28 14:33:07 2013 +0100
    +++ b/mainwindow.cpp Sat Jun 29 07:55:53 2013 +0100
    @@ -3,13 +3,15 @@
    #include "debugwindow.h"
    #include "accountswindow.h"
    #include "joinachatwindow.h"
    +#include "aboutwindow.h"
    MainWindow::MainWindow(QWidget *parent) :
    QMainWindow(parent),
    ui(new Ui::MainWindow),
    m_debugWindow(0),
    m_accountsWindow(0),
    - m_joinAChatWindow(0)
    + m_joinAChatWindow(0),
    + m_aboutWindow(0)
    {
    ui->setupUi(this);
    connect(ui->actionDebug_Window, SIGNAL(triggered()),
    @@ -51,3 +53,13 @@
    m_joinAChatWindow->show();
    }
    +
    +void MainWindow::on_actionAbout_triggered()
    +{
    + if(m_aboutWindow == 0)
    + {
    + m_aboutWindow = new AboutWindow(this);
    + }
    + m_aboutWindow
    + m_aboutWindow->show();
    +}
    --- a/mainwindow.h Fri Jun 28 14:33:07 2013 +0100
    +++ b/mainwindow.h Sat Jun 29 07:55:53 2013 +0100
    @@ -12,6 +12,7 @@
    class DebugWindow;
    class AccountsWindow;
    class JoinAChatWindow;
    +class AboutWindow;
    class MainWindow : public QMainWindow
    {
    @@ -27,11 +28,15 @@
    void on_actionJoin_a_Chat_triggered();
    + void on_actionAbout_triggered();
    +
    private:
    Ui::MainWindow *ui;
    DebugWindow* m_debugWindow;
    AccountsWindow* m_accountsWindow;
    JoinAChatWindow* m_joinAChatWindow;
    + AboutWindow* m_aboutWindow;
    +
    QPurple::QPurpleCore* qpCore;
    };
    --- a/quail.pro Fri Jun 28 14:33:07 2013 +0100
    +++ b/quail.pro Sat Jun 29 07:55:53 2013 +0100
    @@ -1,77 +1,77 @@
    -DEFINES += APP_NAME=\\\"Quail\\\"
    -
    -win32 {
    - DEFINES += BUILDTIME=\\\"$$system('time/T')\\\"
    - DEFINES += BUILDDATE=\\\"$$system('echo %date%')\\\"
    -}
    -else {
    - DEFINES += BUILDTIME=\\\"$$system(date '+%H:%M.%s')\\\"
    - DEFINES += BUILDDATE=\\\"$$system(date '+%d/%m/%y')\\\"
    -}
    -
    -QT += core gui
    -
    -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
    -
    -TARGET = quail
    -TEMPLATE = app
    -
    -SOURCES += main.cpp\
    - mainwindow.cpp \
    - conversationwindow.cpp \
    - debugwindow.cpp \
    - accountswindow.cpp \
    - accountwindow.cpp \
    - joinachatwindow.cpp \
    - conferenceserverwindow.cpp \
    - roomlistwindow.cpp \
    - buddyinfowindow.cpp
    -
    -HEADERS += mainwindow.h \
    - conversationwindow.h \
    - debugwindow.h \
    - accountswindow.h \
    - accountwindow.h \
    - joinachatwindow.h \
    - conferenceserverwindow.h \
    - roomlistwindow.h \
    - buddyinfowindow.h
    -
    -FORMS += mainwindow.ui \
    - conversationwindow.ui \
    - debugwindow.ui \
    - accountswindow.ui \
    - accountwindow.ui \
    - joinachatwindow.ui \
    - conferenceserverwindow.ui \
    - roomlistwindow.ui \
    - buddyinfowindow.ui
    -
    -unix {
    - INCLUDEPATH += /usr/include/glib-2.0 \
    - /usr/lib/glib-2.0/include \
    - /usr/include/libpurple \
    - ../pidgin-main/libpurple \
    - /usr/lib/x86_64-linux-gnu/glib-2.0/include/
    - LIBS += -L"../qpurple/"
    -}
    -win32 {
    - INCLUDEPATH += /cygdrive/c/dev/win32-dev/gtk_2_0-2.14/include/glib-2.0 \
    - /cygdrive/c/dev/win32-dev/gtk_2_0-2.14/include/glib-2.0/include \
    - /cygdrive/c/dev/win32-dev/gtk_2_0-2.14/lib/glib-2.0/include \
    - /cygdrive/c/dev/pidgin-main/libpurple
    -
    - INCLUDEPATH += c:/dev/win32-dev/gtk_2_0-2.14/include/glib-2.0 \
    - c:/dev/win32-dev/gtk_2_0-2.14/include/glib-2.0/include \
    - C:/dev/win32-dev/gtk_2_0-2.14/lib/glib-2.0/include \
    - c:/dev/pidgin-main/libpurple
    -
    -
    - LIBS += -L"C:\dev\win32-dev\gtk-2.24.10\lib"
    - LIBS += -L"C:\dev\pidgin-main\libpurple"
    -}
    -
    -LIBS += -lqpurple
    -
    -RESOURCES += \
    - quail.qrc
    +DEFINES += APP_NAME=\\\"Quail\\\"
    +
    +win32 {
    + DEFINES += BUILDTIME=\\\"$$system('time/T')\\\"
    + DEFINES += BUILDDATE=\\\"$$system('echo %date%')\\\"
    +}
    +else {
    + DEFINES += BUILDTIME=\\\"$$system(date '+%H:%M.%s')\\\"
    + DEFINES += BUILDDATE=\\\"$$system(date '+%d/%m/%y')\\\"
    +}
    +
    +QT += core gui
    +
    +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
    +
    +TARGET = quail
    +TEMPLATE = app
    +
    +SOURCES += main.cpp\
    + mainwindow.cpp \
    + conversationwindow.cpp \
    + debugwindow.cpp \
    + accountswindow.cpp \
    + accountwindow.cpp \
    + joinachatwindow.cpp \
    + conferenceserverwindow.cpp \
    + roomlistwindow.cpp \
    + buddyinfowindow.cpp \
    + aboutwindow.cpp
    +
    +HEADERS += mainwindow.h \
    + conversationwindow.h \
    + debugwindow.h \
    + accountswindow.h \
    + accountwindow.h \
    + joinachatwindow.h \
    + conferenceserverwindow.h \
    + roomlistwindow.h \
    + buddyinfowindow.h \
    + aboutwindow.h
    +
    +FORMS += mainwindow.ui \
    + conversationwindow.ui \
    + debugwindow.ui \
    + accountswindow.ui \
    + accountwindow.ui \
    + joinachatwindow.ui \
    + conferenceserverwindow.ui \
    + roomlistwindow.ui \
    + buddyinfowindow.ui \
    + aboutwindow.ui
    +
    +unix {
    + INCLUDEPATH += /usr/include/glib-2.0 \
    + /usr/lib/glib-2.0/include \
    + /usr/include/libpurple \
    + ../pidgin-main/libpurple \
    + /usr/lib/x86_64-linux-gnu/glib-2.0/include/
    + LIBS += -L"../qpurple/"
    +}
    +win32 {
    + INCLUDEPATH += /cygdrive/c/dev/win32-dev/gtk_2_0-2.14/include/glib-2.0 \
    + /cygdrive/c/dev/win32-dev/gtk_2_0-2.14/include/glib-2.0/include \
    + /cygdrive/c/dev/win32-dev/gtk_2_0-2.14/lib/glib-2.0/include \
    + /cygdrive/c/dev/pidgin-main/libpurple
    +
    + INCLUDEPATH += c:/dev/win32-dev/gtk_2_0-2.14/include/glib-2.0 \
    + c:/dev/win32-dev/gtk_2_0-2.14/include/glib-2.0/include \
    + C:/dev/win32-dev/gtk_2_0-2.14/lib/glib-2.0/include \
    + c:/dev/pidgin-main/libpurple
    +
    +
    + LIBS += -L"C:\dev\win32-dev\gtk-2.24.10\lib"
    + LIBS += -L"C:\dev\pidgin-main\libpurple"
    +}
    +
    +LIBS += -lqpurple