comparison mainwindow.cpp @ 2:c19a4f858aab

Made annotate/resolvelist/resolvemark enable/disable logic better.

     hgExp -> clearLists();
     enableDisableActions();
     hgStat();
 }
 
-void MainWindow::presentLongStdoutToUser(QString stdo, int w, int h)
-{
-    QDialog dlg;
-    dlg.setMinimumWidth(w);
-    dlg.setMinimumHeight(h);
-
-    QVBoxLayout *box = new QVBoxLayout;
-    QListWidget *list = new QListWidget;
-    list-> addItems(stdo.split("\n"));
-    QPushButton *btn = new QPushButton(tr("Ok"));
-    connect(btn, SIGNAL(clicked()), &dlg, SLOT(accept()));
-
-    box -> addWidget(list);
-    box -> addWidget(btn);
-    dlg.setLayout(box);
-
-    dlg.exec();
+#define STDOUT_NEEDS_BIG_WINDOW 512
+#define SMALL_WND_W     500
+#define SMALL_WND_H     300
+
+#define BIG_WND_W       1024
+#define BIG_WND_H       768
+
+
+void MainWindow::presentLongStdoutToUser(QString stdo)
+{
+    if (!stdo.isEmpty())
+    {
+        QDialog dlg;
+
+        if (stdo.length() > STDOUT_NEEDS_BIG_WINDOW)
+        {
+            dlg.setMinimumWidth(BIG_WND_W);
+            dlg.setMinimumHeight(BIG_WND_H);
+        }
+        else
+        {
+            dlg.setMinimumWidth(SMALL_WND_W);
+            dlg.setMinimumHeight(SMALL_WND_H);
+        }
+
+        QVBoxLayout *box = new QVBoxLayout;
+        QListWidget *list = new QListWidget;
+        list-> addItems(stdo.split("\n"));
+        QPushButton *btn = new QPushButton(tr("Ok"));
+        connect(btn, SIGNAL(clicked()), &dlg, SLOT(accept()));
+
+        box -> addWidget(list);
+        box -> addWidget(btn);
+        dlg.setLayout(box);
+
+        dlg.exec();
+    }
+    else
+    {
+        QMessageBox::information(this, tr("HgExplorer"), tr("Mercurial command did not return any output."));
+    }
 }
 
 
 bool MainWindow::isSelectedLocallyDeleted(QListWidget *workList)
 {

 
                     case ACT_INCOMING:
                     case ACT_ANNOTATE:
                     case ACT_RESOLVE_LIST:
                     case ACT_RESOLVE_MARK:
-                        presentLongStdoutToUser(runner -> getStdOut(), 1024, 768);
+                        presentLongStdoutToUser(runner -> getStdOut());
                         shouldHgStat = true;
                         break;
 
                     case ACT_PULL:
                         QMessageBox::information(this, "pull", runner -> getStdOut());

     hgAddAct -> setEnabled(localRepoActionsEnabled);
     hgRemoveAct -> setEnabled(localRepoActionsEnabled);
     hgUpdateAct -> setEnabled(localRepoActionsEnabled);
     hgCommitAct -> setEnabled(localRepoActionsEnabled);
     hgMergeAct -> setEnabled(localRepoActionsEnabled);
+    hgResolveListAct -> setEnabled(localRepoActionsEnabled);
+    hgResolveMarkAct -> setEnabled(localRepoActionsEnabled);
+    hgAnnotateAct -> setEnabled(localRepoActionsEnabled);
 
     hgExp -> enableDisableOtherTabs();
 
     int a, m, r;
     countAMRModifications(hgExp -> workFolderFileList, a, m, r);

             if (!isSelectedLocallyDeleted(hgExp -> workFolderFileList))
             {
                 hgRemoveAct -> setEnabled(false);
             }
 
+            hgResolveListAct -> setEnabled(true);
+
             if (hgExp -> localRepoHeadsList->count() == 1)
             {
                 hgMergeAct -> setEnabled(false);
             }
 
+            QString currentFile = hgExp -> getCurrentFileListLine();
+            if (!currentFile.isEmpty())
+            {
+                hgAnnotateAct -> setEnabled(true);
+                hgResolveMarkAct -> setEnabled(true);
+            }
+            else
+            {
+                hgAnnotateAct -> setEnabled(false);
+                hgResolveMarkAct -> setEnabled(false);
+            }
         }
     }
     else
     {
         QList <QListWidgetItem *> headSelList = hgExp -> localRepoHeadsList->selectedItems();