Skip to content
Permalink
Browse files

Add built-in "Mumble" theme and set "Lite" variant as default.

Adds the Mumble theme as a submodule and ensures it is built
into the binary itself as a resource. Also changes the default
configuration to select the Mumble theme in it's Lite style
as the default. Whether we go with lite or dark in the end we'll
want to select a Metro Mumble style as the default. This will allow
us to always switch to the other without restart because they use
the same icons.
  • Loading branch information...
hacst committed Jun 21, 2015
1 parent 65c1aff commit d27528425160ad21b14eb1d97649ef1aaa77a6a1
Showing with 100 additions and 1 deletion.
  1. +3 −0 .gitmodules
  2. +4 −0 src/mumble/Settings.cpp
  3. +1 −1 src/mumble/mumble.pro
  4. +1 −0 themes/Mumble
  5. +91 −0 themes/MumbleTheme.qrc
@@ -25,3 +25,6 @@
[submodule "3rdparty/speexdsp-src"]
path = 3rdparty/speexdsp-src
url = https://git.xiph.org/speexdsp.git
[submodule "themes/Mumble"]
path = themes/Mumble
url = https://github.com/mumble-voip/mumble-theme.git
@@ -443,6 +443,10 @@ Settings::Settings() {
qmMessages[Log::OtherSelfMute] = Settings::LogConsole;
qmMessages[Log::OtherMutedOther] = Settings::LogConsole;
qmMessages[Log::UserRenamed] = Settings::LogConsole;

// Default theme
themeName = QLatin1String("Mumble");
themeStyleName = QLatin1String("Lite");
}

bool Settings::doEcho() const {
@@ -212,7 +212,7 @@ SOURCES *= BanEditor.cpp \
Themes.cpp

DIST *= ../../icons/mumble.ico licenses.h smallft.h ../../icons/mumble.xpm murmur_pch.h mumble.plist
RESOURCES *= mumble.qrc mumble_translations.qrc mumble_flags.qrc
RESOURCES *= mumble.qrc mumble_translations.qrc mumble_flags.qrc ../../themes/MumbleTheme.qrc
FORMS *= ConfigDialog.ui \
MainWindow.ui \
ConnectDialog.ui \
Submodule Mumble added at 601424
@@ -0,0 +1,91 @@
<!DOCTYPE RCC>
<RCC version="1.0">
<qresource prefix="builtin/themes/Mumble">
<file alias="authenticated.svg">Mumble/authenticated.svg</file>
<file alias="channel.svg">Mumble/channel.svg</file>
<file alias="channel_active.svg">Mumble/channel_active.svg</file>
<file alias="channel_linked.svg">Mumble/channel_linked.svg</file>
<file alias="comment.svg">Mumble/comment.svg</file>
<file alias="comment_seen.svg">Mumble/comment_seen.svg</file>
<file alias="config_asio.png">Mumble/config_asio.png</file>
<file alias="config_audio_input.png">Mumble/config_audio_input.png</file>
<file alias="config_audio_output.png">Mumble/config_audio_output.png</file>
<file alias="config_basic.png">Mumble/config_basic.png</file>
<file alias="config_lcd.png">Mumble/config_lcd.png</file>
<file alias="config_msgs.png">Mumble/config_msgs.png</file>
<file alias="config_network.png">Mumble/config_network.png</file>
<file alias="config_osd.png">Mumble/config_osd.png</file>
<file alias="config_plugin.png">Mumble/config_plugin.png</file>
<file alias="config_shortcuts.png">Mumble/config_shortcuts.png</file>
<file alias="config_ui.png">Mumble/config_ui.png</file>
<file alias="deafened_self.svg">Mumble/deafened_self.svg</file>
<file alias="deafened_server.svg">Mumble/deafened_server.svg</file>
<file alias="default_avatar.svg">Mumble/default_avatar.svg</file>
<file alias="filter.svg">Mumble/filter.svg</file>
<file alias="filter_off.svg">Mumble/filter_off.svg</file>
<file alias="filter_on.svg">Mumble/filter_on.svg</file>
<file alias="Information_icon.svg">Mumble/Information_icon.svg</file>
<file alias="layout_classic.svg">Mumble/layout_classic.svg</file>
<file alias="layout_custom.svg">Mumble/layout_custom.svg</file>
<file alias="layout_hybrid.svg">Mumble/layout_hybrid.svg</file>
<file alias="layout_stacked.svg">Mumble/layout_stacked.svg</file>
<file alias="Dark.qss">Mumble/Dark.qss</file>
<file alias="Lite.qss">Mumble/Lite.qss</file>
<file alias="mumble.ico">Mumble/mumble.ico</file>
<file alias="mumble.osx.png">Mumble/mumble.osx.png</file>
<file alias="mumble.png">Mumble/mumble.png</file>
<file alias="mumble.svg">Mumble/mumble.svg</file>
<file alias="muted_local.svg">Mumble/muted_local.svg</file>
<file alias="muted_self.svg">Mumble/muted_self.svg</file>
<file alias="muted_server.svg">Mumble/muted_server.svg</file>
<file alias="muted_suppressed.svg">Mumble/muted_suppressed.svg</file>
<file alias="overlay.mumblelay">Mumble/overlay.mumblelay</file>
<file alias="priority_speaker.svg">Mumble/priority_speaker.svg</file>
<file alias="self_comment.svg">Mumble/self_comment.svg</file>
<file alias="self_undeafened.svg">Mumble/self_undeafened.svg</file>
<file alias="talking_alt.svg">Mumble/talking_alt.svg</file>
<file alias="talking_off.svg">Mumble/talking_off.svg</file>
<file alias="talking_on.svg">Mumble/talking_on.svg</file>
<file alias="talking_whisper.svg">Mumble/talking_whisper.svg</file>
<file alias="theme.ini">Mumble/theme.ini</file>
<file alias="actions/audio-input-microphone-muted.svg">Mumble/actions/audio-input-microphone-muted.svg</file>
<file alias="actions/audio-input-microphone.svg">Mumble/actions/audio-input-microphone.svg</file>
<file alias="actions/format-text-bold.svg">Mumble/actions/format-text-bold.svg</file>
<file alias="actions/format-text-italic.svg">Mumble/actions/format-text-italic.svg</file>
<file alias="actions/format-text-underline.svg">Mumble/actions/format-text-underline.svg</file>
<file alias="actions/media-record.svg">Mumble/actions/media-record.svg</file>
<file alias="categories/applications-internet.svg">Mumble/categories/applications-internet.svg</file>
<file alias="controls/arrow_down.svg">Mumble/controls/arrow_down.svg</file>
<file alias="controls/arrow_down_disabled.svg">Mumble/controls/arrow_down_disabled.svg</file>
<file alias="controls/arrow_up.svg">Mumble/controls/arrow_up.svg</file>
<file alias="controls/arrow_up_disabled.svg">Mumble/controls/arrow_up_disabled.svg</file>
<file alias="controls/branch_closed.svg">Mumble/controls/branch_closed.svg</file>
<file alias="controls/branch_open.svg">Mumble/controls/branch_open.svg</file>
<file alias="controls/checkbox_check_dark.svg">Mumble/controls/checkbox_check_dark.svg</file>
<file alias="controls/checkbox_check_disabled.svg">Mumble/controls/checkbox_check_disabled.svg</file>
<file alias="controls/checkbox_check_lite.svg">Mumble/controls/checkbox_check_lite.svg</file>
<file alias="controls/handle_horizontal.svg">Mumble/controls/handle_horizontal.svg</file>
<file alias="controls/handle_vertical.svg">Mumble/controls/handle_vertical.svg</file>
<file alias="controls/radio_check_dark.svg">Mumble/controls/radio_check_dark.svg</file>
<file alias="controls/radio_check_disabled.svg">Mumble/controls/radio_check_disabled.svg</file>
<file alias="controls/radio_check_lite.svg">Mumble/controls/radio_check_lite.svg</file>
<file alias="controls/toolbar_ext.svg">Mumble/controls/toolbar_ext.svg</file>
<file alias="emblems/emblem-favorite.svg">Mumble/emblems/emblem-favorite.svg</file>
<file alias="exported/config_asio.svg">Mumble/exported/config_asio.svg</file>
<file alias="exported/config_audio_input.svg">Mumble/exported/config_audio_input.svg</file>
<file alias="exported/config_audio_output.svg">Mumble/exported/config_audio_output.svg</file>
<file alias="exported/config_basic.svg">Mumble/exported/config_basic.svg</file>
<file alias="exported/config_lcd.svg">Mumble/exported/config_lcd.svg</file>
<file alias="exported/config_msgs.svg">Mumble/exported/config_msgs.svg</file>
<file alias="exported/config_network.svg">Mumble/exported/config_network.svg</file>
<file alias="exported/config_osd.svg">Mumble/exported/config_osd.svg</file>
<file alias="exported/config_plugin.svg">Mumble/exported/config_plugin.svg</file>
<file alias="exported/config_shortcuts.svg">Mumble/exported/config_shortcuts.svg</file>
<file alias="exported/config_ui.svg">Mumble/exported/config_ui.svg</file>
<file alias="mimetypes/image-x-generic.svg">Mumble/mimetypes/image-x-generic.svg</file>
<file alias="mimetypes/text-html.svg">Mumble/mimetypes/text-html.svg</file>
<file alias="OSX/OSX Dark.qss">Mumble/OSX/OSX Dark.qss</file>
<file alias="OSX/OSX Lite.qss">Mumble/OSX/OSX Lite.qss</file>
<file alias="status/text-missing.svg">Mumble/status/text-missing.svg</file>
</qresource>
</RCC>

0 comments on commit d275284

Please sign in to comment.
You can’t perform that action at this time.