# # # rename "res/forms/workspace_floater.ui" # to "res/forms/icon_help.ui" # # rename "src/view/WorkspaceFloater.cpp" # to "src/view/panels/IconHelp.cpp" # # rename "src/view/WorkspaceFloater.h" # to "src/view/panels/IconHelp.h" # # add_dir "src/view/panels" # # patch "guitone.pro" # from [94d28e1f978ab95413a81a79f9875f47a35c5568] # to [2e5081039729328f3e97c94a88c227d889768f1e] # # patch "res/forms/icon_help.ui" # from [165989f017be406ba809198e0a3f08a7e5ebed5f] # to [7f8918b02a06b6492f07a0d40a26562a35e35187] # # patch "src/view/DatabaseMenuBar.cpp" # from [eb1cb0434b4cb5e2538fbc2b955f4dbf1d57a167] # to [24128d740e1d3b1b08839bf94d1f348b96bf1fd4] # # patch "src/view/DatabaseMenuBar.h" # from [c1c37db07324335a585574efaec0d73a8d8608f7] # to [b100fad7678bb201825278f5d496dc29bd43fe26] # # patch "src/view/WorkspaceMenuBar.cpp" # from [9b53a8a4b55576cd48adda8634cbd85b5da35d89] # to [922ece3616bb2037926ba3266b7d1ac3b1a6a537] # # patch "src/view/WorkspaceMenuBar.h" # from [42a61673b49017a92bc108f2dcf46bcd8a4c5e49] # to [278cea7ff6194f1e5498e539671c5564381ded4f] # # patch "src/view/WorkspaceWindow.cpp" # from [bcffd1a6e62185ad34ee9d9d0013e58c4556252b] # to [257bc2a4ed393057d7761a32025204992758ee30] # # patch "src/view/WorkspaceWindow.h" # from [ee9feb6b5087706cc2b84f2cafbebcd241d15f0b] # to [909f16bd3e598b6f786389c29c115dc64bfd0848] # # patch "src/view/panels/IconHelp.cpp" # from [94bd8527ee23c8b4b77f10bf6dfb97b23a702818] # to [de5af876fc4867f0900bf347e56c9f3f8f882962] # # patch "src/view/panels/IconHelp.h" # from [7096d08765272d1ddbbda305c01ba1adc0b80a7e] # to [d30837456674a763557907cd9ce1507ffc8235f9] # ============================================================ --- guitone.pro 94d28e1f978ab95413a81a79f9875f47a35c5568 +++ guitone.pro 2e5081039729328f3e97c94a88c227d889768f1e @@ -17,6 +17,7 @@ INCLUDEPATH = src/ \ INCLUDEPATH = src/ \ src/view \ src/view/dialogs \ + src/view/panels \ src/model \ src/monotone \ src/util @@ -31,7 +32,6 @@ HEADERS = src/view/TreeView.h \ src/view/WorkspaceMenuBar.h \ src/view/MainWindow.h \ src/view/WorkspaceWindow.h \ - src/view/WorkspaceFloater.h \ src/view/DatabaseWindow.h \ src/view/dialogs/Dialog.h \ src/view/dialogs/DialogManager.h \ @@ -53,6 +53,7 @@ HEADERS = src/view/TreeView.h \ src/view/dialogs/UnaccountedRenames.h \ src/view/dialogs/AddEditAttribute.h \ src/view/dialogs/OpenPrompt.h \ + src/view/panels/IconHelp.h \ src/monotone/FileExporter.h \ src/monotone/WorkspaceCreator.h \ src/monotone/WorkspaceCommitter.h \ @@ -103,7 +104,6 @@ SOURCES += src/view/TreeView.cpp \ src/view/WorkspaceMenuBar.cpp \ src/view/MainWindow.cpp \ src/view/WorkspaceWindow.cpp \ - src/view/WorkspaceFloater.cpp \ src/view/DatabaseWindow.cpp \ src/view/dialogs/Dialog.cpp \ src/view/dialogs/DialogManager.cpp \ @@ -125,6 +125,7 @@ SOURCES += src/view/TreeView.cpp \ src/view/dialogs/UnaccountedRenames.cpp \ src/view/dialogs/AddEditAttribute.cpp \ src/view/dialogs/OpenPrompt.cpp \ + src/view/panels/IconHelp.cpp \ src/monotone/FileExporter.cpp \ src/monotone/WorkspaceCreator.cpp \ src/monotone/WorkspaceCommitter.cpp \ @@ -183,7 +184,7 @@ FORMS += res/forms/select_revision.ui res/forms/unaccounted_renames.ui \ res/forms/add_edit_attribute.ui \ res/forms/open_prompt.ui \ - res/forms/workspace_floater.ui + res/forms/icon_help.ui UI_DIR = tmp OBJECTS_DIR = tmp ============================================================ --- res/forms/workspace_floater.ui 165989f017be406ba809198e0a3f08a7e5ebed5f +++ res/forms/icon_help.ui 7f8918b02a06b6492f07a0d40a26562a35e35187 @@ -1,6 +1,6 @@ - WorkspaceFloater - + IconHelp + 0 ============================================================ --- src/view/DatabaseMenuBar.cpp eb1cb0434b4cb5e2538fbc2b955f4dbf1d57a167 +++ src/view/DatabaseMenuBar.cpp 24128d740e1d3b1b08839bf94d1f348b96bf1fd4 @@ -54,7 +54,19 @@ DatabaseMenuBar::DatabaseMenuBar(QWidget actionCheckout_revision, SIGNAL(triggered()), this, SIGNAL(showCheckoutRevision()) ); + + // + // the dock widget menu + // + menuDockWidgets = new QMenu(tr("Panels"), this); + menuWindow->addSeparator(); + menuWindow->addAction(menuDockWidgets->menuAction()); } DatabaseMenuBar::~DatabaseMenuBar() {} +void DatabaseMenuBar::addDockWidgetAction(QAction * act) +{ + menuDockWidgets->addAction(act); +} + ============================================================ --- src/view/DatabaseMenuBar.h c1c37db07324335a585574efaec0d73a8d8608f7 +++ src/view/DatabaseMenuBar.h b100fad7678bb201825278f5d496dc29bd43fe26 @@ -28,6 +28,8 @@ public: DatabaseMenuBar(QWidget *); ~DatabaseMenuBar(); + void addDockWidgetAction(QAction * action); + signals: void showCheckoutRevision(); void showChangesetBrowser(); @@ -39,6 +41,7 @@ protected: QAction * actionCheckout_revision; QMenu * menuDatabase; + QMenu * menuDockWidgets; }; #endif ============================================================ --- src/view/WorkspaceMenuBar.cpp 9b53a8a4b55576cd48adda8634cbd85b5da35d89 +++ src/view/WorkspaceMenuBar.cpp 922ece3616bb2037926ba3266b7d1ac3b1a6a537 @@ -162,13 +162,6 @@ WorkspaceMenuBar::WorkspaceMenuBar(QWidg actionFind_unaccounted_renames, SIGNAL(triggered()), this, SIGNAL(showUnaccountedRenames()) ); - - // - // the dock widget menu - // - menuDockWidgets = new QMenu(tr("Panels"), this); - menuWindow->addSeparator(); - menuWindow->addAction(menuDockWidgets->menuAction()); } WorkspaceMenuBar::~WorkspaceMenuBar() {} @@ -217,8 +210,3 @@ void WorkspaceMenuBar::toggleHideIgnored actionHide_ignored_files->setData(QVariant(!hide)); } -void WorkspaceMenuBar::addDockWidgetAction(QAction * act) -{ - menuDockWidgets->addAction(act); -} - ============================================================ --- src/view/WorkspaceMenuBar.h 42a61673b49017a92bc108f2dcf46bcd8a4c5e49 +++ src/view/WorkspaceMenuBar.h 278cea7ff6194f1e5498e539671c5564381ded4f @@ -28,8 +28,6 @@ public: WorkspaceMenuBar(QWidget *); ~WorkspaceMenuBar(); - void addDockWidgetAction(QAction * action); - signals: void hideIgnoredFiles(bool); void expandTree(bool); @@ -63,7 +61,6 @@ protected: QMenu * menuView; QMenu * menuShow; QMenu * menuWorkspace; - QMenu * menuDockWidgets; private slots: void toggleExpandTree(); ============================================================ --- src/view/WorkspaceWindow.cpp bcffd1a6e62185ad34ee9d9d0013e58c4556252b +++ src/view/WorkspaceWindow.cpp 257bc2a4ed393057d7761a32025204992758ee30 @@ -28,7 +28,7 @@ WorkspaceWindow::WorkspaceWindow() : Dat WorkspaceWindow::WorkspaceWindow() : DatabaseWindow(), mainSplitter(0), listSplitter(0), treeView(0), listView(0), attrView(0), statusBar(0), - workspaceFloater(0), + iconHelp(0), invModel(0), attrModel(0), proxyModelFolderTree(0), proxyModelFileList(0) { setObjectName("WorkspaceWindow"); @@ -47,10 +47,10 @@ WorkspaceWindow::~WorkspaceWindow() if (listSplitter) delete listSplitter; if (mainSplitter) delete mainSplitter; if (statusBar) delete statusBar; - if (workspaceFloater) + if (iconHelp) { - removeDockWidget(workspaceFloater); - delete workspaceFloater; + removeDockWidget(iconHelp); + delete iconHelp; } // do the same with the models @@ -240,10 +240,10 @@ void WorkspaceWindow::setup() attrView->setModel(attrModel); - workspaceFloater = new WorkspaceFloater(this); + iconHelp = new IconHelp(this); dynamic_cast(menuBar) - ->addDockWidgetAction(workspaceFloater->toggleViewAction()); + ->addDockWidgetAction(iconHelp->toggleViewAction()); } void WorkspaceWindow::load(const QString & path) ============================================================ --- src/view/WorkspaceWindow.h ee9feb6b5087706cc2b84f2cafbebcd241d15f0b +++ src/view/WorkspaceWindow.h 909f16bd3e598b6f786389c29c115dc64bfd0848 @@ -28,7 +28,7 @@ #include "InventoryView.h" #include "AttributesView.h" #include "Splitter.h" -#include "WorkspaceFloater.h" +#include "IconHelp.h" #include @@ -53,7 +53,7 @@ protected: InventoryView * listView; AttributesView * attrView; QStatusBar * statusBar; - WorkspaceFloater * workspaceFloater; + IconHelp * iconHelp; Inventory * invModel; GetAttributes * attrModel; ============================================================ --- src/view/WorkspaceFloater.cpp 94bd8527ee23c8b4b77f10bf6dfb97b23a702818 +++ src/view/panels/IconHelp.cpp de5af876fc4867f0900bf347e56c9f3f8f882962 @@ -16,12 +16,12 @@ * along with this program. If not, see . * ***************************************************************************/ -#include "WorkspaceFloater.h" +#include "IconHelp.h" #include "IconProvider.h" #include -WorkspaceFloater::WorkspaceFloater(QWidget * parent) : QDockWidget(parent) +IconHelp::IconHelp(QWidget * parent) : QDockWidget(parent) { QWidget * parentWidget = new QWidget(this); setupUi(parentWidget); @@ -49,5 +49,5 @@ WorkspaceFloater::WorkspaceFloater(QWidg setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); } -WorkspaceFloater::~WorkspaceFloater() {} +IconHelp::~IconHelp() {} ============================================================ --- src/view/WorkspaceFloater.h 7096d08765272d1ddbbda305c01ba1adc0b80a7e +++ src/view/panels/IconHelp.h d30837456674a763557907cd9ce1507ffc8235f9 @@ -16,19 +16,19 @@ * along with this program. If not, see . * ***************************************************************************/ -#ifndef WORKSPACE_FLOATER_H -#define WORKSPACE_FLOATER_H +#ifndef ICON_HELP_H +#define ICON_HELP_H #include -#include "ui_workspace_floater.h" +#include "ui_icon_help.h" -class WorkspaceFloater : public QDockWidget, private Ui::WorkspaceFloater +class IconHelp : public QDockWidget, private Ui::IconHelp { Q_OBJECT public: - WorkspaceFloater(QWidget *); - ~WorkspaceFloater(); + IconHelp(QWidget *); + ~IconHelp(); }; #endif