Skip to content
This repository has been archived by the owner on Feb 16, 2025. It is now read-only.

Commit

Permalink
Qt GUI xdg icon theme support rework:
Browse files Browse the repository at this point in the history
Rename desktop file: correct reverse url from org.elektra to org.libelektra. Rename elektra-qt to elektra-qt-editor and use that in future references to the qt-gui as it is a clearer name about the function of the program and binary.

Rename ChooseColorWindow: The ChooseColorWindows will be replaced by a
AppearanceSettingsWindow, all references to ChooseColor, choose color have been
replaced by AppearanceSettings or choose appearance.
  • Loading branch information
rautesamtr committed May 28, 2016
1 parent 7cad757 commit 7f5e7e1
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion src/tools/qt-gui/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ target_link_libraries(qt-gui ${Qt5Quick_LIBRARIES} ${Qt5Gui_LIBRARIES}
tool_link_elektratools(qt-gui elektra-ease)

install(TARGETS qt-gui DESTINATION ${TARGET_TOOL_EXEC_FOLDER})
install(FILES org.elektra.elektra-qt.desktop DESTINATION share/applications)
install(FILES org.libelektra.elektra-qt-editor.desktop DESTINATION share/applications)
install(FILES ../../../doc/images/circle.svg DESTINATION share/icons/hicolor/scalable/apps RENAME elektra.svg)

generate_manpage (kdb-qt-gui FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/README.md)
Expand Down
8 changes: 4 additions & 4 deletions src/tools/qt-gui/qml/GUIActions.qml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Item {
property alias whatsThisAction: whatsThisAction
property alias pluginInfoAction: pluginInfoAction
property alias quitAction: quitAction
property alias chooseColorAction: chooseColorAction
property alias chooseAppearanceAction: chooseAppearanceAction

Action {
id: newKeyAction
Expand Down Expand Up @@ -377,10 +377,10 @@ Item {
}

Action {
id: chooseColorAction
text: qsTr("Choose Colors ...")
id: chooseAppearanceAction
text: qsTr("Choose Appearance ...")
iconSource: "icons/color.png"
onTriggered: chooseColorWindow.show()
onTriggered: appearanceSettingsWindow.show()
}
}

2 changes: 1 addition & 1 deletion src/tools/qt-gui/qml/MainMenuBar.qml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ MenuBar {
title: qsTr("Settings")

MenuItem {
action: guiActions.chooseColorAction
action: guiActions.chooseAppearanceAction
}
}

Expand Down
12 changes: 6 additions & 6 deletions src/tools/qt-gui/qml/main.qml
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,8 @@ ApplicationWindow {
id: pluginInfo
}

ChooseColorWindow {
id: chooseColorWindow
AppearanceSettingsWindow {
id: appearanceSettingsWindow
}

//**Dialogs************************************************************************************************//
Expand Down Expand Up @@ -204,19 +204,19 @@ ApplicationWindow {
onAccepted: {
if (type === "highlight" && guiSettings.highlightColor !== colorDialog.color) {
guiSettings.highlightColor = colorDialog.color
chooseColorWindow.colorEdited = true
appearanceSettingsWindow.colorEdited = true
}
else if (type === "frame" && guiSettings.frameColor !== colorDialog.color) {
guiSettings.frameColor = colorDialog.color
chooseColorWindow.colorEdited = true
appearanceSettingsWindow.colorEdited = true
}
else if (type === "nodeWith" && guiSettings.nodeWithKeyColor !== colorDialog.color) {
guiSettings.nodeWithKeyColor = colorDialog.color
chooseColorWindow.colorEdited = true
appearanceSettingsWindow.colorEdited = true
}
else if (type === "nodeWithout" && guiSettings.nodeWithoutKeyColor !== colorDialog.color) {
guiSettings.nodeWithoutKeyColor = colorDialog.color
chooseColorWindow.colorEdited = true
appearanceSettingsWindow.colorEdited = true
}

close()
Expand Down
2 changes: 1 addition & 1 deletion src/tools/qt-gui/resources.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<file>qml/PluginInfo.qml</file>
<file>qml/icons/edit-delete.png</file>
<file>qml/Indicator.qml</file>
<file>qml/ChooseColorWindow.qml</file>
<file>qml/AppearanceSettingsWindow.qml</file>
<file>qml/icons/color.png</file>
<file>qml/MergeStrategyComboBox.qml</file>
<file>qml/icons/dialog-information.png</file>
Expand Down

0 comments on commit 7f5e7e1

Please sign in to comment.