From 7fe2432c78cae6e7eb73af31a7ca91f950cad0c8 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 28 Sep 2022 17:42:25 +0200 Subject: [PATCH] ClearCase: Inline undocheckout.ui Change-Id: Id687cc5346cbbac01258efdf28eac427e7d97581 Reviewed-by: Orgad Shaneh Reviewed-by: --- src/plugins/clearcase/CMakeLists.txt | 1 - src/plugins/clearcase/clearcase.qbs | 1 - src/plugins/clearcase/clearcaseplugin.cpp | 106 +++++++++++++----- src/plugins/clearcase/undocheckout.ui | 127 ---------------------- 4 files changed, 77 insertions(+), 158 deletions(-) delete mode 100644 src/plugins/clearcase/undocheckout.ui diff --git a/src/plugins/clearcase/CMakeLists.txt b/src/plugins/clearcase/CMakeLists.txt index c0e0fcbf00e..62f47e86e73 100644 --- a/src/plugins/clearcase/CMakeLists.txt +++ b/src/plugins/clearcase/CMakeLists.txt @@ -12,6 +12,5 @@ add_qtc_plugin(ClearCase clearcasesubmiteditorwidget.cpp clearcasesubmiteditorwidget.h clearcasesync.cpp clearcasesync.h settingspage.cpp settingspage.h - undocheckout.ui versionselector.cpp versionselector.h versionselector.ui ) diff --git a/src/plugins/clearcase/clearcase.qbs b/src/plugins/clearcase/clearcase.qbs index 2b99f5a92c3..c2f02dcddd2 100644 --- a/src/plugins/clearcase/clearcase.qbs +++ b/src/plugins/clearcase/clearcase.qbs @@ -36,7 +36,6 @@ QtcPlugin { "clearcasesync.h", "settingspage.cpp", "settingspage.h", - "undocheckout.ui", "versionselector.cpp", "versionselector.h", "versionselector.ui", diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp index 236b2bb50b6..96f7500db5a 100644 --- a/src/plugins/clearcase/clearcaseplugin.cpp +++ b/src/plugins/clearcase/clearcaseplugin.cpp @@ -13,7 +13,6 @@ #include "clearcasesync.h" #include "settingspage.h" #include "versionselector.h" -#include "ui_undocheckout.h" #include #include @@ -32,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -47,7 +47,10 @@ #include #include +#include #include +#include +#include #include #include #include @@ -56,6 +59,7 @@ #include #include #include +#include #include #include #include @@ -66,6 +70,7 @@ #include #include #include + #ifdef WITH_TESTS #include #include @@ -80,22 +85,22 @@ using namespace std::placeholders; namespace ClearCase { namespace Internal { -static const char CLEARCASE_CONTEXT[] = "ClearCase Context"; -static const char CMD_ID_CLEARCASE_MENU[] = "ClearCase.Menu"; -static const char CMD_ID_CHECKOUT[] = "ClearCase.CheckOut"; -static const char CMD_ID_CHECKIN[] = "ClearCase.CheckInCurrent"; -static const char CMD_ID_UNDOCHECKOUT[] = "ClearCase.UndoCheckOut"; -static const char CMD_ID_UNDOHIJACK[] = "ClearCase.UndoHijack"; -static const char CMD_ID_DIFF_CURRENT[] = "ClearCase.DiffCurrent"; -static const char CMD_ID_HISTORY_CURRENT[] = "ClearCase.HistoryCurrent"; -static const char CMD_ID_ANNOTATE[] = "ClearCase.Annotate"; -static const char CMD_ID_ADD_FILE[] = "ClearCase.AddFile"; -static const char CMD_ID_DIFF_ACTIVITY[] = "ClearCase.DiffActivity"; -static const char CMD_ID_CHECKIN_ACTIVITY[] = "ClearCase.CheckInActivity"; -static const char CMD_ID_UPDATEINDEX[] = "ClearCase.UpdateIndex"; -static const char CMD_ID_UPDATE_VIEW[] = "ClearCase.UpdateView"; -static const char CMD_ID_CHECKIN_ALL[] = "ClearCase.CheckInAll"; -static const char CMD_ID_STATUS[] = "ClearCase.Status"; +const char CLEARCASE_CONTEXT[] = "ClearCase Context"; +const char CMD_ID_CLEARCASE_MENU[] = "ClearCase.Menu"; +const char CMD_ID_CHECKOUT[] = "ClearCase.CheckOut"; +const char CMD_ID_CHECKIN[] = "ClearCase.CheckInCurrent"; +const char CMD_ID_UNDOCHECKOUT[] = "ClearCase.UndoCheckOut"; +const char CMD_ID_UNDOHIJACK[] = "ClearCase.UndoHijack"; +const char CMD_ID_DIFF_CURRENT[] = "ClearCase.DiffCurrent"; +const char CMD_ID_HISTORY_CURRENT[] = "ClearCase.HistoryCurrent"; +const char CMD_ID_ANNOTATE[] = "ClearCase.Annotate"; +const char CMD_ID_ADD_FILE[] = "ClearCase.AddFile"; +const char CMD_ID_DIFF_ACTIVITY[] = "ClearCase.DiffActivity"; +const char CMD_ID_CHECKIN_ACTIVITY[] = "ClearCase.CheckInActivity"; +const char CMD_ID_UPDATEINDEX[] = "ClearCase.UpdateIndex"; +const char CMD_ID_UPDATE_VIEW[] = "ClearCase.UpdateView"; +const char CMD_ID_CHECKIN_ALL[] = "ClearCase.CheckInAll"; +const char CMD_ID_STATUS[] = "ClearCase.Status"; const int s_silentRun = VcsCommand::NoOutput | VcsCommand::FullySynchronously; const int s_verboseRun = VcsCommand::ShowStdOut | VcsCommand::FullySynchronously; @@ -1017,6 +1022,53 @@ void ClearCasePluginPrivate::setStatus(const QString &file, FileStatus::Status s QMetaObject::invokeMethod(this, &ClearCasePluginPrivate::updateStatusActions); } +class UndoCheckOutDialog : public QDialog +{ + Q_DECLARE_TR_FUNCTIONS(ClearCase::Internal::UndoCheckOut) + +public: + UndoCheckOutDialog() + { + resize(323, 105); + setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); + setWindowTitle(tr("Dialog")); + + lblMessage = new QLabel(this); + + QPalette palette; + QBrush brush(QColor(255, 0, 0, 255)); + brush.setStyle(Qt::SolidPattern); + palette.setBrush(QPalette::Active, QPalette::WindowText, brush); + palette.setBrush(QPalette::Inactive, QPalette::WindowText, brush); + QBrush brush1(QColor(68, 96, 92, 255)); + brush1.setStyle(Qt::SolidPattern); + palette.setBrush(QPalette::Disabled, QPalette::WindowText, brush1); + + auto lblModified = new QLabel(tr("The file was changed.")); + lblModified->setPalette(palette); + + chkKeep = new QCheckBox(tr("&Save copy of the file with a '.keep' extension")); + chkKeep->setChecked(true); + + auto buttonBox = new QDialogButtonBox(QDialogButtonBox::No|QDialogButtonBox::Yes); + + using namespace Layouting; + + Column { + lblMessage, + lblModified, + chkKeep, + buttonBox + }.attachTo(this); + + connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); + connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); + } + + QLabel *lblMessage; + QCheckBox *chkKeep; +}; + void ClearCasePluginPrivate::undoCheckOutCurrent() { const VcsBasePluginState state = currentState(); @@ -1033,14 +1085,12 @@ void ClearCasePluginPrivate::undoCheckOutCurrent() bool keep = false; if (result.exitCode()) { // return value is 1 if there is any difference - Ui::UndoCheckOut uncoUi; - QDialog uncoDlg; - uncoUi.setupUi(&uncoDlg); - uncoUi.lblMessage->setText(tr("Do you want to undo the check out of \"%1\"?").arg(fileName)); - uncoUi.chkKeep->setChecked(m_settings.keepFileUndoCheckout); - if (uncoDlg.exec() != QDialog::Accepted) + UndoCheckOutDialog dialog; + dialog.lblMessage->setText(tr("Do you want to undo the check out of \"%1\"?").arg(fileName)); + dialog.chkKeep->setChecked(m_settings.keepFileUndoCheckout); + if (dialog.exec() != QDialog::Accepted) return; - keep = uncoUi.chkKeep->isChecked(); + keep = dialog.chkKeep->isChecked(); if (keep != m_settings.keepFileUndoCheckout) { m_settings.keepFileUndoCheckout = keep; m_settings.toSettings(ICore::settings()); @@ -1117,15 +1167,13 @@ void ClearCasePluginPrivate::undoHijackCurrent() askKeep = false; } if (askKeep) { - Ui::UndoCheckOut unhijackUi; - QDialog unhijackDlg; - unhijackUi.setupUi(&unhijackDlg); + UndoCheckOutDialog unhijackDlg; unhijackDlg.setWindowTitle(tr("Undo Hijack File")); - unhijackUi.lblMessage->setText(tr("Do you want to undo hijack of \"%1\"?") + unhijackDlg.lblMessage->setText(tr("Do you want to undo hijack of \"%1\"?") .arg(QDir::toNativeSeparators(fileName))); if (unhijackDlg.exec() != QDialog::Accepted) return; - keep = unhijackUi.chkKeep->isChecked(); + keep = unhijackDlg.chkKeep->isChecked(); } FileChangeBlocker fcb(FilePath::fromString(state.currentFile())); diff --git a/src/plugins/clearcase/undocheckout.ui b/src/plugins/clearcase/undocheckout.ui deleted file mode 100644 index af28f7ed0a6..00000000000 --- a/src/plugins/clearcase/undocheckout.ui +++ /dev/null @@ -1,127 +0,0 @@ - - - ClearCase::Internal::UndoCheckOut - - - - 0 - 0 - 323 - 105 - - - - - 0 - 0 - - - - Dialog - - - - - - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 68 - 96 - 92 - - - - - - - - The file was changed. - - - - - - - &Save copy of the file with a '.keep' extension - - - true - - - - - - - Qt::Horizontal - - - QDialogButtonBox::No|QDialogButtonBox::Yes - - - - - - - - - buttonBox - accepted() - ClearCase::Internal::UndoCheckOut - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - ClearCase::Internal::UndoCheckOut - reject() - - - 316 - 260 - - - 286 - 274 - - - - -