Merge branch 'develop'

[lichviet-widget] / settingsdlg.cpp

diff --git a/settingsdlg.cpp b/settingsdlg.cpp
index 20a0189..ec37296 100644 (file)
--- a/settingsdlg.cpp
+++ b/settingsdlg.cpp
@@ -28,41 +28,27 @@ SettingsDlg::SettingsDlg(QWidget *parent) :
     connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
     connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
 
-    tabWidget = new QTabWidget;
-    tabWidget ->addTab(new ThemeTab(), QString::fromUtf8("Mẫu widget"));
-    tabWidget ->addTab(new GeneralTab(), QString::fromUtf8("Giới thiệu"));
+    vboxlayout = new QVBoxLayout;
+    vboxlayout1 = new QVBoxLayout;
 
     mainLayout = new QGridLayout(this);
 
-    mainLayout->addWidget(tabWidget,0,0,1,1);
-    mainLayout->addWidget(buttonBox,0,1,1,1);
+    vboxlayout1->addWidget(buttonBox);
 
+    view = new QDeclarativeView(this);
+    view->setSource(QUrl("/opt/lichvietwidget/qml/lichvietwidget/settings.qml"));
+
+    vboxlayout->addWidget(view);
+
+    mainLayout->addLayout(vboxlayout,0 ,0,1,1);
+    mainLayout->addLayout(vboxlayout1,0,1,1,1);
 \
     this->setLayout(mainLayout);
 
 }
 
 void SettingsDlg::showSettingsDialog(){
+    this->setMinimumHeight(325);
     this->show();
 }
 
-GeneralTab::GeneralTab(QWidget *parent)
-     : QWidget(parent)
-{
-    mainLayout = new QVBoxLayout;
-    setLayout(mainLayout);
-}
-
-ThemeTab::ThemeTab(QWidget *parent)
-     : QWidget(parent)
-{
-    themes = new QListWidget(this);
-    themes->addItem(new QListWidgetItem( QString::fromUtf8("Mặc định")));
-    themes->addItem(new QListWidgetItem( QString::fromUtf8("Vừa phải")));
-    themes->addItem(new QListWidgetItem( QString::fromUtf8("Lớn")));
-
-    mainLayout = new QVBoxLayout;
-    mainLayout->addWidget(themes);
-    setLayout(mainLayout);
-}
-