-
-
Notifications
You must be signed in to change notification settings - Fork 1.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix setting window title as modified #11542
Draft
varjolintu
wants to merge
1
commit into
keepassxreboot:develop
Choose a base branch
from
varjolintu:fix/window_modified_title
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+3
−3
Draft
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1033,8 +1033,8 @@ void MainWindow::updateWindowTitle() | |
|
||
if (stackedWidgetIndex == DatabaseTabScreen && tabWidgetIndex != -1) { | ||
customWindowTitlePart = m_ui->tabWidget->tabName(tabWidgetIndex); | ||
if (isModified) { | ||
// remove asterisk '*' from title | ||
if (!isModified) { | ||
// Remove asterisk '*' from title | ||
customWindowTitlePart.remove(customWindowTitlePart.size() - 1, 1); | ||
} | ||
m_ui->actionDatabaseSave->setEnabled(m_ui->tabWidget->canSave(tabWidgetIndex)); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This should be handled within the action state function instead of here. |
||
|
@@ -1046,7 +1046,7 @@ void MainWindow::updateWindowTitle() | |
if (customWindowTitlePart.isEmpty()) { | ||
windowTitle = BaseWindowTitle; | ||
} else { | ||
windowTitle = QString("%1[*] - %2").arg(customWindowTitlePart, BaseWindowTitle); | ||
windowTitle = QString("%1 - %2").arg(customWindowTitlePart, BaseWindowTitle); | ||
} | ||
|
||
if (customWindowTitlePart.isEmpty() || stackedWidgetIndex == 1) { | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This line is not good because it assumes an asterisk is the very last character.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I have already changed this to
.replace()
in my test branch. That line also removed the last]
in some cases even without this change.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perhaps an adjustment to the tab widget function is in order as well, I briefly looked at it and seemed too much
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems that we need a new can after the worms are all out.