widgets: pack all widgets into dcc::widgets

Change-Id: I3ead86c7f54c074c4f2d03ea5f0dbed05cb6bf86
linuxdeepin · Dec 12, 2016 · 46ce72e · 46ce72e
1 parent 8c88db8
commit 46ce72e
Show file tree

Hide file tree

Showing 121 changed files with 298 additions and 146 deletions.
diff --git a/frame/framewidget.h b/frame/framewidget.h
@@ -10,7 +10,7 @@
 /// FrameWidget can auto adjust size to fit parent Frame
 ///
 
-using namespace dcc;
+using namespace dcc::widgets;
 
 class Frame;
 class FrameWidget : public TranslucentFrame

diff --git a/frame/moduleinitthread.cpp b/frame/moduleinitthread.cpp
@@ -1,7 +1,7 @@
 #include "moduleinitthread.h"
 #include "modulewidget.h"
 
-ModuleInitThread::ModuleInitThread(ModuleInterface *inter, QObject *parent)
+ModuleInitThread::ModuleInitThread(dcc::ModuleInterface *inter, QObject *parent)
     : QThread(parent),
 
       m_module(inter)

diff --git a/frame/moduleinitthread.h b/frame/moduleinitthread.h
@@ -10,16 +10,16 @@ class ModuleInitThread : public QThread
     Q_OBJECT
 
 public:
-    explicit ModuleInitThread(ModuleInterface *inter, QObject *parent = 0);
+    explicit ModuleInitThread(dcc::ModuleInterface *inter, QObject *parent = 0);
 
 signals:
-    void moduleInitFinished(ModuleInterface *inter) const;
+    void moduleInitFinished(dcc::ModuleInterface *inter) const;
 
 protected:
     void run();
 
 private:
-    ModuleInterface *m_module;
+    dcc::ModuleInterface *m_module;
 };
 
 #endif // MODULEINITTHREAD_H
diff --git a/frame/pluginscontroller.h b/frame/pluginscontroller.h
@@ -5,7 +5,7 @@
 
 #include <QObject>
 
-using namespace dde;
+using namespace dcc;
 
 class PluginsController : public QObject, public FrameProxyInterface
 {

diff --git a/frame/quick_control/basicsettingspage.cpp b/frame/quick_control/basicsettingspage.cpp
@@ -2,7 +2,7 @@
 
 #include <QVBoxLayout>
 
-using namespace dcc;
+using namespace dcc::widgets;
 
 BasicSettingsPage::BasicSettingsPage(QWidget *parent)
     : QWidget(parent),

diff --git a/frame/quick_control/basicsettingspage.h b/frame/quick_control/basicsettingspage.h
@@ -12,8 +12,8 @@ class BasicSettingsPage : public QWidget
     explicit BasicSettingsPage(QWidget *parent = 0);
 
 private:
-    dcc::DCCSlider *m_soundSlider;
-    dcc::DCCSlider *m_lightSlider;
+    dcc::widgets::DCCSlider *m_soundSlider;
+    dcc::widgets::DCCSlider *m_lightSlider;
 };
 
 #endif // BASICSETTINGSPAGE_H
diff --git a/frame/settingswidget.h b/frame/settingswidget.h
@@ -10,6 +10,7 @@
 #include <QPushButton>
 
 using namespace dcc;
+using namespace dcc::widgets;
 
 class Frame;
 class SettingsWidget : public ContentWidget, public FrameProxyInterface

diff --git a/interfaces/frameproxyinterface.h b/interfaces/frameproxyinterface.h
@@ -10,10 +10,12 @@
 #ifndef FRAMEPROXYINTERFACE_H
 #define FRAMEPROXYINTERFACE_H
 
+namespace dcc {
 class ContentWidget;
 class ModuleInterface;
+}
 
-namespace dde {
+namespace dcc {
 
 class FrameProxyInterface
 {

diff --git a/interfaces/moduleinterface.h b/interfaces/moduleinterface.h
@@ -14,15 +14,17 @@
 
 #include <QtCore>
 
-using namespace dde;
-
+namespace dcc {
 class ModuleWidget;
 class ContentWidget;
+}
 //struct ModuleMetadata {
 //    QString icon;
 //    QString title;
 //};
 
+namespace dcc {
+
 // ModuleInterface作为每个规范每个Module的接口，每个Module实现必须实现其所有虚函数。
 class ModuleInterface
 {
@@ -76,4 +78,6 @@ class ModuleInterface
     FrameProxyInterface *m_frameProxy = nullptr;
 };
 
+}
+
 #endif // MODULEINTERFACE_H
diff --git a/interfaces/plugininterface.h b/interfaces/plugininterface.h
@@ -14,7 +14,7 @@
 
 #include <QtCore>
 
-using namespace dde;
+using namespace dcc;
 
 struct ModuleMetadata {
     QString icon;

diff --git a/modules/accounts/accountsdetailwidget.cpp b/modules/accounts/accountsdetailwidget.cpp
@@ -7,7 +7,7 @@
 
 #include "removeuserdialog.h"
 
-using namespace dcc;
+using namespace dcc::widgets;
 using namespace dcc::accounts;
 
 AccountsDetailWidget::AccountsDetailWidget(User *user, QWidget *parent)

diff --git a/modules/accounts/accountsdetailwidget.h b/modules/accounts/accountsdetailwidget.h
@@ -33,10 +33,10 @@ private slots:
 
 private:
     User *m_user;
-    dcc::SettingsGroup *m_accountSettings;
-    dcc::NextPageWidget *m_modifyAvatar;
-    dcc::NextPageWidget *m_modifyPassword;
-    dcc::SwitchWidget *m_autoLogin;
+    dcc::widgets::SettingsGroup *m_accountSettings;
+    dcc::widgets::NextPageWidget *m_modifyAvatar;
+    dcc::widgets::NextPageWidget *m_modifyPassword;
+    dcc::widgets::SwitchWidget *m_autoLogin;
     QPushButton *m_deleteAccount;
 };
 

diff --git a/modules/accounts/accountsmodule.cpp b/modules/accounts/accountsmodule.cpp
@@ -4,6 +4,8 @@
 #include "modifyavatarpage.h"
 #include "createpage.h"
 
+using namespace dcc;
+using namespace dcc::widgets;
 using namespace dcc::accounts;
 
 AccountsModule::AccountsModule(FrameProxyInterface *frame, QObject *parent)

diff --git a/modules/accounts/accountswidget.cpp b/modules/accounts/accountswidget.cpp
@@ -9,13 +9,13 @@
 #include <QPushButton>
 #include <QDebug>
 
-using namespace dcc;
+using namespace dcc::widgets;
 using namespace dcc::accounts;
 
 AccountsWidget::AccountsWidget()
     : ModuleWidget(),
 
-    m_userGroup(new SettingsGroup),
+    m_userGroup(new dcc::widgets::SettingsGroup),
     m_createBtn(new QPushButton(tr("Create Account")))
 {
     setObjectName("Accounts");

diff --git a/modules/accounts/accountswidget.h b/modules/accounts/accountswidget.h
@@ -29,7 +29,7 @@ public slots:
     void removeUser(User *user);
 
 private:
-    dcc::SettingsGroup *m_userGroup;
+    dcc::widgets::SettingsGroup *m_userGroup;
 
     QPushButton *m_createBtn;
 };

diff --git a/modules/accounts/createpage.cpp b/modules/accounts/createpage.cpp
@@ -15,6 +15,8 @@
 
 #include "translucentframe.h"
 
+using namespace dcc::widgets;
+
 namespace dcc {
 namespace accounts {
 

diff --git a/modules/accounts/createpage.h b/modules/accounts/createpage.h
@@ -60,10 +60,10 @@ public slots:
 
 private:
     AvatarWidget *m_avatar;
-    SettingsGroup *m_group;
-    LineEditWidget *m_username;
-    LineEditWidget *m_password;
-    LineEditWidget *m_repeatpass;
+    dcc::widgets::SettingsGroup *m_group;
+    dcc::widgets::LineEditWidget *m_username;
+    dcc::widgets::LineEditWidget *m_password;
+    dcc::widgets::LineEditWidget *m_repeatpass;
     QPushButton *m_confirmBtn;
     QPushButton *m_cancelBtn;
 

diff --git a/modules/accounts/modifyavatarpage.cpp b/modules/accounts/modifyavatarpage.cpp
@@ -7,7 +7,7 @@
 
 #include <dimagebutton.h>
 
-using namespace dcc;
+using namespace dcc::widgets;
 using namespace dcc::accounts;
 
 DWIDGET_USE_NAMESPACE

diff --git a/modules/accounts/modifypasswordpage.cpp b/modules/accounts/modifypasswordpage.cpp
@@ -5,7 +5,7 @@
 #include <QVBoxLayout>
 #include <QDebug>
 
-using namespace dcc;
+using namespace dcc::widgets;
 using namespace dcc::accounts;
 
 ModifyPasswordPage::ModifyPasswordPage(User *user, QWidget *parent)

diff --git a/modules/accounts/modifypasswordpage.h b/modules/accounts/modifypasswordpage.h
@@ -26,8 +26,8 @@ private slots:
 private:
     User *m_userInter;
 
-    dcc::LineEditWidget *m_pwdEdit;
-    dcc::LineEditWidget *m_pwdEditRepeat;
+    dcc::widgets::LineEditWidget *m_pwdEdit;
+    dcc::widgets::LineEditWidget *m_pwdEditRepeat;
     QPushButton *m_cancel;
     QPushButton *m_accept;
 };

diff --git a/modules/bluetooth/adapterwidget.h b/modules/bluetooth/adapterwidget.h
@@ -17,6 +17,8 @@
 #include "switchwidget.h"
 #include "settingsgroup.h"
 
+using namespace dcc::widgets;
+
 namespace dcc {
 namespace bluetooth {
 

diff --git a/modules/bluetooth/detailpage.cpp b/modules/bluetooth/detailpage.cpp
@@ -28,7 +28,7 @@ DetailPage::DetailPage(const Adapter *adapter, const Device *device) :
 {
     setTitle(device->name());
 
-    TranslucentFrame *frame = new TranslucentFrame;
+    dcc::widgets::TranslucentFrame *frame = new dcc::widgets::TranslucentFrame;
     QVBoxLayout *layout = new QVBoxLayout(frame);
     layout->setSpacing(0);
     layout->setMargin(0);

diff --git a/modules/bluetooth/devicesettingsitem.cpp b/modules/bluetooth/devicesettingsitem.cpp
@@ -17,6 +17,8 @@
 #include "labels/normallabel.h"
 #include "nextbutton.h"
 
+using namespace dcc::widgets;
+
 namespace dcc {
 namespace bluetooth {
 

diff --git a/modules/bluetooth/devicesettingsitem.h b/modules/bluetooth/devicesettingsitem.h
@@ -13,7 +13,6 @@
 #include "settingsitem.h"
 #include "device.h"
 
-class NormalLabel;
 
 namespace Dtk {
 namespace Widget {
@@ -22,14 +21,14 @@ class DLoadingIndicator;
 }
 
 namespace dcc {
-
 namespace widgets {
+class NormalLabel;
 class NextButton;
 }
 
 namespace bluetooth {
 
-class DeviceSettingsItem : public SettingsItem
+class DeviceSettingsItem : public dcc::widgets::SettingsItem
 {
     Q_OBJECT
 public:
@@ -54,8 +53,8 @@ private slots:
 private:
     const Device *m_device;
 
-    NormalLabel *m_titleLabel;
-    NormalLabel *m_tipLabel;
+    dcc::widgets::NormalLabel *m_titleLabel;
+    dcc::widgets::NormalLabel *m_tipLabel;
     Dtk::Widget::DLoadingIndicator *m_loadingIndicator;
     dcc::widgets::NextButton *m_nextButton;
 };

diff --git a/modules/bluetooth/pincodedialog.cpp b/modules/bluetooth/pincodedialog.cpp
@@ -11,12 +11,14 @@
 
 #include "labels/largelabel.h"
 
+using namespace dcc::widgets;
+
 namespace dcc {
 namespace bluetooth {
 
 PinCodeDialog::PinCodeDialog(const QString &pinCode, const bool &cancelable) :
     DDialog(),
-    m_pinCodeLabel(new LargeLabel)
+    m_pinCodeLabel(new dcc::widgets::LargeLabel)
 {
     setTitle(tr("The PIN for connecting to the Bluetooth device is:"));
     setIcon(QIcon::fromTheme("notification-bluetooth-connected"));

diff --git a/modules/bluetooth/pincodedialog.h b/modules/bluetooth/pincodedialog.h
@@ -14,9 +14,12 @@
 
 DWIDGET_USE_NAMESPACE
 
-class LargeLabel;
 
 namespace dcc {
+namespace widgets {
+class LargeLabel;
+}
+
 namespace bluetooth {
 
 class PinCodeDialog : public DDialog
@@ -29,7 +32,7 @@ class PinCodeDialog : public DDialog
     void setPinCode(const QString &pinCode);
 
 private:
-    LargeLabel *m_pinCodeLabel;
+    dcc::widgets::LargeLabel *m_pinCodeLabel;
 };
 
 } // namespace bluetooth

diff --git a/modules/datetime/chosedialog.cpp b/modules/datetime/chosedialog.cpp
@@ -18,6 +18,8 @@
 #include <QJsonObject>
 #include <QJsonDocument>
 
+using namespace dcc::widgets;
+
 namespace dcc {
 namespace datetime {
 

diff --git a/modules/datetime/chosedialog.h b/modules/datetime/chosedialog.h
@@ -33,7 +33,7 @@ public slots:
 private:
     bool m_flag;
     MapWidget* m_widget;
-    SearchInput* m_search;
+    dcc::widgets::SearchInput* m_search;
     QPushButton* m_cancel;
     QPushButton* m_add;
 };

diff --git a/modules/datetime/clock.h b/modules/datetime/clock.h
@@ -11,7 +11,7 @@ using namespace dcc;
 namespace dcc {
 namespace datetime {
 
-class Clock: public SettingsItem
+class Clock: public widgets::SettingsItem
 {
     Q_OBJECT
 

diff --git a/modules/datetime/datetimewidget.h b/modules/datetime/datetimewidget.h
@@ -7,7 +7,7 @@
 #include "settingsitem.h"
 
 DWIDGET_USE_NAMESPACE
-using namespace dcc;
+using namespace dcc::widgets;
 
 namespace dcc {
 namespace datetime {

diff --git a/modules/datetime/timezoneitem.h b/modules/datetime/timezoneitem.h
@@ -15,7 +15,7 @@ DWIDGET_USE_NAMESPACE
 namespace dcc {
 namespace datetime {
 
-class TimezoneItem : public SettingsItem
+class TimezoneItem : public dcc::widgets::SettingsItem
 {
     Q_OBJECT
 

diff --git a/modules/defapp/defappviewer.cpp b/modules/defapp/defappviewer.cpp
@@ -33,8 +33,8 @@ QWidget* DefAppViewer::defappDetail() {
     m_modSoftware = new DefCategoryWidget(tr("Software"), this);
     m_modSoftware->hide();
 
-    m_switchWidget = new dcc::SwitchWidget();
-    connect(m_switchWidget, &dcc::SwitchWidget::checkedChanegd, this, &DefAppViewer::autoOpenChanged);
+    m_switchWidget = new dcc::widgets::SwitchWidget();
+    connect(m_switchWidget, &dcc::widgets::SwitchWidget::checkedChanegd, this, &DefAppViewer::autoOpenChanged);
 
     m_mainlayout->addWidget(m_modBrowser);
     m_mainlayout->addWidget(m_modMail);