# # # patch "src/view/dialogs/CommitRevision.cpp" # from [f45a93b0ab0bf9424c8f8954df0dfd713ee106c8] # to [46aa99721df59476868e9b0268854f01a9729259] # # patch "src/view/dialogs/CommitRevision.h" # from [fa771fad59fa250e0b18893ffe695fce586e4771] # to [1d143af306b3bc2d2dc6a714fc4e760f393ccb28] # # patch "src/view/dialogs/WorkspaceDialogManager.cpp" # from [2653389421d692448d35b2ce7e5ce14f769bbd99] # to [052fef6ee22f29c32c391a7ba659852f78328496] # ============================================================ --- src/view/dialogs/CommitRevision.cpp f45a93b0ab0bf9424c8f8954df0dfd713ee106c8 +++ src/view/dialogs/CommitRevision.cpp 46aa99721df59476868e9b0268854f01a9729259 @@ -34,21 +34,8 @@ CommitRevision::CommitRevision(QWidget * setupUi(this); Dialog::init(); - QStringList entries = Settings::getItemList("ChangelogEntries"); - QRegExp re("\\s+"); - - for (int i=0, j=entries.size(); iinsertItem(i, shortened, QVariant(entry)); - } - revModel = new GetRevision(this); changeView->setModel(revModel); - revModel->readWorkspaceRevision(workspacePath); connect( revModel, SIGNAL(revisionRead()), @@ -64,9 +51,6 @@ CommitRevision::CommitRevision(QWidget * changesAgainstParent, SIGNAL(currentIndexChanged(const QString &)), revModel, SLOT(showChangesAgainstParent(const QString &)) ); - - // initialize the text view with the most recent entry - setChangelogEntryFromList(0); } CommitRevision::~CommitRevision() @@ -74,8 +58,28 @@ CommitRevision::~CommitRevision() delete revModel; } +void CommitRevision::readWorkspaceRevision() +{ + revModel->readWorkspaceRevision(workspacePath); + + QStringList entries = Settings::getItemList("ChangelogEntries"); + QRegExp re("\\s+"); + + previousChangelogEntryList->clear(); + for (int i=0, j=entries.size(); iinsertItem(i, shortened, QVariant(entry)); + } + previousChangelogEntryList->insertItem(-1, tr("-- select --"), QVariant()); +} + void CommitRevision::setChangelogEntryFromList(int index) { + if (index < 0) return; changelogEntry->setPlainText( previousChangelogEntryList->itemData(index).toString() ); ============================================================ --- src/view/dialogs/CommitRevision.h fa771fad59fa250e0b18893ffe695fce586e4771 +++ src/view/dialogs/CommitRevision.h 1d143af306b3bc2d2dc6a714fc4e760f393ccb28 @@ -33,6 +33,9 @@ public: CommitRevision(QWidget *, const WorkspacePath &); ~CommitRevision(); +public slots: + void readWorkspaceRevision(); + signals: void revisionCommitted(const QString &); ============================================================ --- src/view/dialogs/WorkspaceDialogManager.cpp 2653389421d692448d35b2ce7e5ce14f769bbd99 +++ src/view/dialogs/WorkspaceDialogManager.cpp 052fef6ee22f29c32c391a7ba659852f78328496 @@ -66,6 +66,7 @@ void WorkspaceDialogManager::showCommitR ); } + commitRevision->readWorkspaceRevision(); showDialog(commitRevision); }