#
#
# patch "res/forms/about.ui"
# from [f004b4c36f6a3db9198a777e6d5e04760969341d]
# to [39c80c3266c8087c74ad9377c7f9398872dfdc4c]
#
# patch "res/forms/open_prompt.ui"
# from [b1765ae7f084ee971f6dbb02708a19665c3311cb]
# to [a724da94e2ef7a6b9dc3cc92e45ae6ce47721835]
#
# patch "res/forms/preferences.ui"
# from [7a7571da041337f90d222a67051d0b363fb6b9b2]
# to [69162c4976189a8f3930ae77d23968e764934990]
#
# patch "src/view/dialogs/OpenPrompt.cpp"
# from [cb2a6c25e78678efb597a83d1f6fb42d635fcd14]
# to [8405123faeeb7372fa48fa75b359dff168f7c8bd]
#
# patch "src/view/dialogs/OpenPrompt.h"
# from [8cdfb40d1faaa80d3d366f83ed9bd6019212dda2]
# to [8ceff233c41326a951ee86ec30496258ea1759b4]
#
# patch "src/view/dialogs/Preferences.cpp"
# from [d1f74302d4a191be707d1011732c3fbd2ce131a1]
# to [9cc4653180d5ad4f5491c4ac5a43119d3d9c61d1]
#
============================================================
--- res/forms/about.ui f004b4c36f6a3db9198a777e6d5e04760969341d
+++ res/forms/about.ui 39c80c3266c8087c74ad9377c7f9398872dfdc4c
@@ -9,18 +9,6 @@
420
-
-
- 460
- 420
-
-
-
-
- 460
- 420
-
-
About guitone
@@ -28,20 +16,8 @@
:/icons/guitone.png
-
- 9
-
-
- 6
-
-
-
- 0
-
-
- 6
-
-
@@ -63,6 +39,12 @@
-
+
+
+ 0
+ 0
+
+
@@ -82,12 +64,6 @@
-
-
- 0
-
-
- 6
-
-
============================================================
--- res/forms/open_prompt.ui b1765ae7f084ee971f6dbb02708a19665c3311cb
+++ res/forms/open_prompt.ui a724da94e2ef7a6b9dc3cc92e45ae6ce47721835
@@ -8,7 +8,7 @@
true
-
+
0
0
@@ -32,21 +32,16 @@
-
-
-
- 0
- 0
-
-
Opens an existing monotone database to browse revisions, files and metadata.
-If you like to checkout a new workspace, open a database first and then use "Checkout revision" in the "Database" menu.
+If you like to checkout a new workspace, open a database first and then use
+"Checkout revision" in the "Database" menu.
Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
- true
+ false
5
@@ -70,6 +65,12 @@ If you like to checkout a new workspace,
Qt::Horizontal
+
+
+ 20
+ 40
+
+
-
@@ -103,14 +104,9 @@ If you like to checkout a new workspace,
-
-
-
- 0
- 0
-
-
- Opens an existing workspace directory. If you previously checked out a workspace, use this to manage it.
+ Opens an existing workspace directory.
+If you previously checked out a workspace, use this to manage it.
Qt::AutoText
@@ -119,7 +115,7 @@ If you like to checkout a new workspace,
Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
- true
+ false
5
@@ -143,6 +139,12 @@ If you like to checkout a new workspace,
Qt::Horizontal
+
+
+ 20
+ 40
+
+
-
@@ -169,6 +171,26 @@ If you like to checkout a new workspace,
-
-
+
+
+ About
+
+
+ false
+
+
+
+ -
+
+
+ Preferences
+
+
+ false
+
+
+
+ -
Qt::Horizontal
@@ -184,7 +206,7 @@ If you like to checkout a new workspace,
-
- Quit guitone
+ Quit
============================================================
--- res/forms/preferences.ui 7a7571da041337f90d222a67051d0b363fb6b9b2
+++ res/forms/preferences.ui 69162c4976189a8f3930ae77d23968e764934990
@@ -5,7 +5,7 @@
0
0
- 433
+ 439
370
@@ -31,21 +31,6 @@
true
-
- 6
-
-
- 9
-
-
- 9
-
-
- 9
-
-
- 9
-
-
@@ -261,9 +246,6 @@
-
-
- false
-
read workspace incrementally (faster for big directory trees)
============================================================
--- src/view/dialogs/OpenPrompt.cpp cb2a6c25e78678efb597a83d1f6fb42d635fcd14
+++ src/view/dialogs/OpenPrompt.cpp 8405123faeeb7372fa48fa75b359dff168f7c8bd
@@ -71,6 +71,17 @@ OpenPrompt::OpenPrompt(QWidget * parent)
);
}
+ dialogManager = new DialogManager(this);
+
+ connect(
+ btnAbout, SIGNAL(clicked()),
+ dialogManager, SLOT(showAbout())
+ );
+
+ connect(
+ btnPreferences, SIGNAL(clicked()),
+ dialogManager, SLOT(showPreferences())
+ );
}
OpenPrompt::~OpenPrompt() {};
============================================================
--- src/view/dialogs/OpenPrompt.h 8cdfb40d1faaa80d3d366f83ed9bd6019212dda2
+++ src/view/dialogs/OpenPrompt.h 8ceff233c41326a951ee86ec30496258ea1759b4
@@ -20,6 +20,7 @@
#define OPEN_PROMPT_H
#include "Dialog.h"
+#include "DialogManager.h"
#include "ui_open_prompt.h"
class OpenPrompt : public Dialog, private Ui::OpenPromptDialog
@@ -39,6 +40,9 @@ private slots:
void openWorkspace();
void recentDatabaseChanged(int);
void recentWorkspaceChanged(int);
+
+private:
+ DialogManager * dialogManager;
};
#endif
============================================================
--- src/view/dialogs/Preferences.cpp d1f74302d4a191be707d1011732c3fbd2ce131a1
+++ src/view/dialogs/Preferences.cpp 9cc4653180d5ad4f5491c4ac5a43119d3d9c61d1
@@ -120,7 +120,7 @@ void Preferences::accept()
Settings::setBool("CheckForUpdates", checkForUpdates->isChecked());
- if (Settings::getBool("ReadWorkspaceIncrementally", true) !=
+ if (Settings::getBool("ReadWorkspaceIncrementally", false) !=
readWorkspaceIncrementally->isChecked())
{
QMessageBox::information(