summaryrefslogtreecommitdiffstats
path: root/Swift
diff options
context:
space:
mode:
Diffstat (limited to 'Swift')
-rw-r--r--Swift/QtUI/QtViewHistoryWindow.cpp4
-rw-r--r--Swift/QtUI/QtViewHistoryWindow.h2
l---------Swift/QtUI/QtViewHistoryWindow.ui1
-rw-r--r--Swift/QtUI/SConscript1
4 files changed, 6 insertions, 2 deletions
diff --git a/Swift/QtUI/QtViewHistoryWindow.cpp b/Swift/QtUI/QtViewHistoryWindow.cpp
index be83036..8905c19 100644
--- a/Swift/QtUI/QtViewHistoryWindow.cpp
+++ b/Swift/QtUI/QtViewHistoryWindow.cpp
@@ -6,13 +6,13 @@
#include "QtViewHistoryWindow.h"
#include <QWidget>
-#include "QtDebug"
#include <QBoxLayout>
namespace Swift {
QtViewHistoryWindow::QtViewHistoryWindow() {
- qDebug() << "I am here";
+ ui.setupUi(this);
+ show();
}
void QtViewHistoryWindow::show() {
diff --git a/Swift/QtUI/QtViewHistoryWindow.h b/Swift/QtUI/QtViewHistoryWindow.h
index 2d1ca57..00f33b4 100644
--- a/Swift/QtUI/QtViewHistoryWindow.h
+++ b/Swift/QtUI/QtViewHistoryWindow.h
@@ -11,6 +11,7 @@
#include <Swift/Controllers/UIInterfaces/ViewHistoryWindow.h>
#include <Swiften/JID/JID.h>
+#include <Swift/QtUI/ui_QtViewHistoryWindow.h>
namespace Swift {
class QtViewHistoryWindow : public QWidget, public ViewHistoryWindow {
@@ -21,6 +22,7 @@ namespace Swift {
void setEnabled(bool enabled);
private:
+ Ui::QtViewHistoryWindow ui;
JID jid_;
};
}
diff --git a/Swift/QtUI/QtViewHistoryWindow.ui b/Swift/QtUI/QtViewHistoryWindow.ui
new file mode 120000
index 0000000..cd19376
--- /dev/null
+++ b/Swift/QtUI/QtViewHistoryWindow.ui
@@ -0,0 +1 @@
+/home/vlad/test.ui \ No newline at end of file
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index e475388..778596b 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -167,6 +167,7 @@ myenv.Uic4("UserSearch/QtUserSearchWizard.ui")
myenv.Uic4("UserSearch/QtUserSearchFirstPage.ui")
myenv.Uic4("UserSearch/QtUserSearchFieldsPage.ui")
myenv.Uic4("UserSearch/QtUserSearchResultsPage.ui")
+myenv.Uic4("QtViewHistoryWindow.ui")
myenv.Uic4("QtBookmarkDetailWindow.ui")
myenv.Uic4("QtJoinMUCWindow.ui")
myenv.Qrc("DefaultTheme.qrc")