Swiftdiff options
| author | Vlad Voicu <vladvoic@gmail.com> | 2011-05-25 14:46:10 (GMT) |
|---|---|---|
| committer | Vlad Voicu <vladvoic@gmail.com> | 2011-05-25 14:46:10 (GMT) |
| commit | 7ee88ef79ddf1914387f3e2440070f51e3467004 (patch) | |
| tree | ad6907afe6dcd0e2c383d08612ec5220deabe8ec | |
| parent | 8dd6e4daf472fd56ae7d8902c45e5dd564a0eafa (diff) | |
| download | swift-contrib-7ee88ef79ddf1914387f3e2440070f51e3467004.zip swift-contrib-7ee88ef79ddf1914387f3e2440070f51e3467004.tar.bz2 | |
First Layout for History Window
| -rw-r--r-- | Swift/QtUI/QtViewHistoryWindow.cpp | 8 | ||||
| -rw-r--r-- | Swift/QtUI/QtViewHistoryWindow.h | 2 | ||||
| -rw-r--r--[l---------] | Swift/QtUI/QtViewHistoryWindow.ui | 181 |
3 files changed, 189 insertions, 2 deletions
diff --git a/Swift/QtUI/QtViewHistoryWindow.cpp b/Swift/QtUI/QtViewHistoryWindow.cpp index 8905c19..71f77b8 100644 --- a/Swift/QtUI/QtViewHistoryWindow.cpp +++ b/Swift/QtUI/QtViewHistoryWindow.cpp @@ -4,14 +4,20 @@ * See Documentation/Licenses/BSD-simplified.txt for more information. */ -#include "QtViewHistoryWindow.h" #include <QWidget> #include <QBoxLayout> +#include "QtViewHistoryWindow.h" +#include "QtChatView.h" +#include "QtChatTheme.h" + namespace Swift { QtViewHistoryWindow::QtViewHistoryWindow() { ui.setupUi(this); + QtChatTheme *theme = new QtChatTheme(""); // Where should I get the theme path from? + messageLog_ = new QtChatView(theme, this); + ui.chatView_->addWidget(messageLog_); show(); } diff --git a/Swift/QtUI/QtViewHistoryWindow.h b/Swift/QtUI/QtViewHistoryWindow.h index 00f33b4..145731c 100644 --- a/Swift/QtUI/QtViewHistoryWindow.h +++ b/Swift/QtUI/QtViewHistoryWindow.h @@ -12,6 +12,7 @@ #include <Swiften/JID/JID.h> #include <Swift/QtUI/ui_QtViewHistoryWindow.h> +#include <QtChatView.h> namespace Swift { class QtViewHistoryWindow : public QWidget, public ViewHistoryWindow { @@ -22,6 +23,7 @@ namespace Swift { void setEnabled(bool enabled); private: + QtChatView* messageLog_; Ui::QtViewHistoryWindow ui; JID jid_; }; diff --git a/Swift/QtUI/QtViewHistoryWindow.ui b/Swift/QtUI/QtViewHistoryWindow.ui index cd19376..17a5b6b 120000..100644 --- a/Swift/QtUI/QtViewHistoryWindow.ui +++ b/Swift/QtUI/QtViewHistoryWindow.ui @@ -1 +1,180 @@ -/home/vlad/test.ui
\ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>QtViewHistoryWindow</class> + <widget class="QWidget" name="QtViewHistoryWindow"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>990</width> + <height>614</height> + </rect> + </property> + <property name="windowTitle"> + <string>Form</string> + </property> + <widget class="QLabel" name="label_2"> + <property name="geometry"> + <rect> + <x>930</x> + <y>1100</y> + <width>131</width> + <height>17</height> + </rect> + </property> + <property name="text"> + <string>Search keywords:</string> + </property> + </widget> + <widget class="QTextEdit" name="textEdit_2"> + <property name="geometry"> + <rect> + <x>930</x> + <y>1120</y> + <width>651</width> + <height>31</height> + </rect> + </property> + </widget> + <widget class="QLabel" name="label"> + <property name="geometry"> + <rect> + <x>1350</x> + <y>1100</y> + <width>61</width> + <height>16</height> + </rect> + </property> + <property name="text"> + <string>Today</string> + </property> + </widget> + <widget class="QTreeView" name="treeView"> + <property name="geometry"> + <rect> + <x>1590</x> + <y>620</y> + <width>256</width> + <height>531</height> + </rect> + </property> + </widget> + <widget class="QScrollBar" name="horizontalScrollBar"> + <property name="geometry"> + <rect> + <x>1420</x> + <y>1100</y> + <width>160</width> + <height>16</height> + </rect> + </property> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + </widget> + <widget class="QWidget" name="gridLayoutWidget"> + <property name="geometry"> + <rect> + <x>100</x> + <y>30</y> + <width>871</width> + <height>571</height> + </rect> + </property> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="2" column="0"> + <widget class="QWidget" name="widget" native="true"> + <widget class="QTreeView" name="treeView_2"> + <property name="geometry"> + <rect> + <x>610</x> + <y>20</y> + <width>251</width> + <height>471</height> + </rect> + </property> + </widget> + <widget class="QWidget" name="gridLayoutWidget_2"> + <property name="geometry"> + <rect> + <x>20</x> + <y>20</y> + <width>581</width> + <height>471</height> + </rect> + </property> + <layout class="QGridLayout" name="chatView_"/> + </widget> + <widget class="QWidget" name="gridLayoutWidget_3"> + <property name="geometry"> + <rect> + <x>20</x> + <y>500</y> + <width>841</width> + <height>61</height> + </rect> + </property> + <layout class="QGridLayout" name="gridLayout_4"> + <item row="1" column="0"> + <widget class="QWidget" name="widget_3" native="true"> + <widget class="QTextEdit" name="textEdit_3"> + <property name="geometry"> + <rect> + <x>0</x> + <y>20</y> + <width>841</width> + <height>31</height> + </rect> + </property> + </widget> + <widget class="QLabel" name="label_3"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>131</width> + <height>17</height> + </rect> + </property> + <property name="text"> + <string>Search keywords:</string> + </property> + </widget> + <widget class="QScrollBar" name="horizontalScrollBar_2"> + <property name="geometry"> + <rect> + <x>490</x> + <y>0</y> + <width>160</width> + <height>16</height> + </rect> + </property> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + </widget> + <widget class="QLabel" name="label_4"> + <property name="geometry"> + <rect> + <x>410</x> + <y>0</y> + <width>61</width> + <height>16</height> + </rect> + </property> + <property name="text"> + <string>Today</string> + </property> + </widget> + </widget> + </item> + </layout> + </widget> + </widget> + </item> + </layout> + </widget> + </widget> + <resources/> + <connections/> +</ui> |