[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/work/soc-kdesdk-dolphin-plugins-hg/dolphin-plugins/hg
From: Vishesh Yadav <vishesh3y () gmail ! com>
Date: 2011-08-12 21:22:43
Message-ID: 20110812212243.78125AC7CB () svn ! kde ! org
[Download RAW message or body]
SVN commit 1246812 by visheshyadav:
Some bug fixes
M +1 -0 config-widgets/generalconfig.cpp
M +4 -0 config-widgets/pluginsettings.h
M +9 -0 fileviewhgplugin.h
M +5 -1 syncdialogbase.cpp
--- branches/work/soc-kdesdk-dolphin-plugins-hg/dolphin-plugins/hg/config-widgets/generalconfig.cpp \
#1246811:1246812 @@ -54,6 +54,7 @@
mainLayout->addWidget(mergeLabel, 2, 0);
mainLayout->addWidget(m_mergeEdit, 2, 1);
mainLayout->addWidget(m_verboseCheck, 3, 0, 2, 0);
+ mainLayout->setRowStretch(mainLayout->rowCount(), 1);
setLayout(mainLayout);
}
--- branches/work/soc-kdesdk-dolphin-plugins-hg/dolphin-plugins/hg/config-widgets/pluginsettings.h \
#1246811:1246812 @@ -27,6 +27,10 @@
class KConfig;
class KPushButton;
+/**
+ * Plugin Specific settings. Not those supposed to be saved in
+ * .hgrc file, but in $HOME/.dolphin-hg
+ */
class HgPluginSettingsWidget : public QWidget
{
Q_OBJECT
--- branches/work/soc-kdesdk-dolphin-plugins-hg/dolphin-plugins/hg/fileviewhgplugin.h \
#1246811:1246812 @@ -54,7 +54,16 @@
* a lot of warnings.
*/
void createHgWrapper();
+
+ /**
+ * Simply clear status messages ie m_errorMsg and m_operationCompletedMsg
+ */
void clearMessages();
+
+ /**
+ * Read executable file path to open diff patches with from
+ * $HOME/.dolphin-hg file in INI format
+ */
QString visualDiffExecPath();
private slots:
--- branches/work/soc-kdesdk-dolphin-plugins-hg/dolphin-plugins/hg/syncdialogbase.cpp \
#1246811:1246812 @@ -159,7 +159,11 @@
{
if (exitCode != 0 || status != QProcess::NormalExit) {
- KMessageBox::error(this, \
QTextCodec::codecForLocale()->toUnicode(m_process.readAllStandardError())); + \
QString message = QTextCodec::codecForLocale()->toUnicode(m_process.readAllStandardError());
+ if (message.isEmpty()) {
+ message = i18nc("@message", "No changes found!");
+ }
+ KMessageBox::error(this, message);
return;
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic