osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Qt: Info label fixes in the Profile dialog 

When copying from another profile which has been renamed:
show the new profile name in the info label "Created from".

When copying from another profile which is later deleted:
append "(deleted)" to the info label to indicate that the origin
profile is not in the list.

Do not show "Renamed from" when a profile name if renamed back to
it's original name.

Change-Id: I0bf0c868c5dfd150a23b2ef887e7c70030b48d05
Reviewed-on: https://code.wireshark.org/review/32201
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
This commit is contained in:
Stig Bjørlykke 2019-02-26 20:05:32 +01:00
parent 54b678f9f8
commit 54417ed16a
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ui/qt/profile_dialog.cpp
View File

@ -165,9 +165,30 @@ void ProfileDialog::updateWidgets()
break;
case PROF_STAT_COPY:
if (current_profile->reference) {
profile_info = tr("Created from %1").arg(current_profile->reference);
bool reference_exists = false;
gchar *reference = current_profile->reference;
GList *fl_entry = edited_profile_list();
while (fl_entry && fl_entry->data) {
profile_def *profile = (profile_def *) fl_entry->data;
if (strcmp(current_profile->reference, profile->reference) == 0) {
if (profile->status != PROF_STAT_COPY) {
// Reference profile exists (and is not current profile)
reference_exists = true;
}
if (profile->status == PROF_STAT_CHANGED) {
// Reference profile was renamed, use the new name
reference = profile->name;
break;
}
}
fl_entry = g_list_next(fl_entry);
}
profile_info = tr("Created from %1").arg(reference);
if (current_profile->from_global) {
profile_info.append(QString(" %1").arg(tr("(system provided)")));
} else if (!reference_exists) {
profile_info.append(QString(" %1").arg(tr("(deleted)")));
}
break;
}
@ -387,7 +408,9 @@ void ProfileDialog::editingFinished()
if (item->text(0).compare(profile->name) != 0) {
g_free(profile->name);
profile->name = qstring_strdup(item->text(0));
if (profile->status == PROF_STAT_EXISTS) {
if (strcmp(profile->name, profile->reference) == 0) {
profile->status = PROF_STAT_EXISTS;
} else if (profile->status == PROF_STAT_EXISTS) {
profile->status = PROF_STAT_CHANGED;
}
}