#
#
# patch "res/forms/select_revision.ui"
# from [b901de21917e7ec4fa9b7ebfa3f1bb5a93bdcf47]
# to [03e8e5245a8259df4d0e43880ce006638c79da0a]
#
# patch "src/view/dialogs/CheckoutRevision.cpp"
# from [f7a2e8661c9967f13f1fd0fdf1203683b727bcd7]
# to [c7260153678322e42542431f32fd5d4b4d386bc2]
#
# patch "src/view/dialogs/DatabaseDialogManager.cpp"
# from [eb4feceb46333f6f80063ca4804563f7cb442086]
# to [ee1d232681bf6a8d303e61213d1dab5f2a981526]
#
============================================================
--- res/forms/select_revision.ui b901de21917e7ec4fa9b7ebfa3f1bb5a93bdcf47
+++ res/forms/select_revision.ui 03e8e5245a8259df4d0e43880ce006638c79da0a
@@ -16,28 +16,10 @@
:/icons/guitone.png
-
- 9
-
-
- 6
-
-
-
- 0
-
-
- 6
-
-
-
- 0
-
-
- 6
-
-
@@ -70,12 +52,6 @@
-
- 0
-
-
- 6
-
-
@@ -88,12 +64,6 @@
-
-
- 0
-
-
- 6
-
-
@@ -165,12 +135,6 @@
-
-
- 0
-
-
- 6
-
-
@@ -212,6 +176,7 @@
Splitter
QSplitter
+ 1
TreeView
@@ -237,8 +202,8 @@
accept()
- 546
- 386
+ 544
+ 344
96
@@ -253,8 +218,8 @@
reject()
- 632
- 386
+ 463
+ 344
179
@@ -262,5 +227,21 @@
+
+ selectorValue
+ returnPressed()
+ searchRevsBtn
+ click()
+
+
+ 281
+ 27
+
+
+ 503
+ 22
+
+
+
============================================================
--- src/view/dialogs/CheckoutRevision.cpp f7a2e8661c9967f13f1fd0fdf1203683b727bcd7
+++ src/view/dialogs/CheckoutRevision.cpp c7260153678322e42542431f32fd5d4b4d386bc2
@@ -73,14 +73,6 @@ CheckoutRevision::CheckoutRevision(QWidg
browseDirs, SIGNAL(clicked()),
this, SLOT(openDirBrowser())
);
-
- // FIXME: this is a bit hacky, because we assume that the parent, i.e.
- // the MainWindow by convention, signals the outcome of a successful
- // revision selection through the SelectRevision dialog
- connect(
- parent, SIGNAL(revisionSelected(const QString &)),
- this, SLOT(setSelectedRevision(const QString &))
- );
}
CheckoutRevision::~CheckoutRevision()
@@ -255,6 +247,12 @@ void CheckoutRevision::setSelectedRevisi
void CheckoutRevision::setSelectedRevision(const QString & revision)
{
+ if (!isHidden())
+ {
+ raise();
+ activateWindow();
+ }
+
selectedRevision->setText(revision);
}
============================================================
--- src/view/dialogs/DatabaseDialogManager.cpp eb4feceb46333f6f80063ca4804563f7cb442086
+++ src/view/dialogs/DatabaseDialogManager.cpp ee1d232681bf6a8d303e61213d1dab5f2a981526
@@ -199,11 +199,6 @@ void DatabaseDialogManager::showSelectRe
this, SLOT(showRevisionManifest(const QString &))
);
- connect(
- selectRevision, SIGNAL(revisionSelected(const QString &)),
- this, SLOT(revisionSelected(const QString &))
- );
-
if (checkoutRevision)
{
connect(