diff --git a/app/ui/control.glade b/app/ui/control.glade index 966de852..5de42e2a 100644 --- a/app/ui/control.glade +++ b/app/ui/control.glade @@ -431,7 +431,9 @@ Author: Dmitriy Yefremov False center 5 - 5 + 10 + 10 + 10 True @@ -1605,7 +1607,7 @@ audio-volume-medium-symbolic 5 - True + False False document-edit-symbolic diff --git a/app/ui/default_style.css b/app/ui/default_style.css deleted file mode 100644 index 12fac8b4..00000000 --- a/app/ui/default_style.css +++ /dev/null @@ -1,43 +0,0 @@ -* { - -GtkDialog-action-area-border: 5em; -} - -entry { - min-height: 2em; -} - -button { - min-height: 1.5em; - padding-left: 0.5em; - padding-right: 0.5em; - padding-top: 0.1em; - padding-bottom: 0.1em; -} - -spinbutton { - min-height: 1.5em; -} - -toolbutton { - padding: 0.1em; -} - -spinner { - padding-left: 1em; - padding-right: 1em; -} - -infobar { - min-height: 2em; -} - -switch slider { - min-height: 1.5em; - min-width: 1.5em; -} - -paned > separator { - background-repeat: no-repeat; - background-position: center; - background-size: 1px 24px; -} diff --git a/app/ui/main_window.glade b/app/ui/main_window.glade index 0295f229..08133e56 100644 --- a/app/ui/main_window.glade +++ b/app/ui/main_window.glade @@ -566,7 +566,7 @@ Author: Dmitriy Yefremov 135 - 175 + 150 True False 5 @@ -652,7 +652,6 @@ Author: Dmitriy Yefremov 135 - 175 True True 5 diff --git a/app/ui/settings_dialog.py b/app/ui/settings_dialog.py index d553ba04..f4ec9a9f 100644 --- a/app/ui/settings_dialog.py +++ b/app/ui/settings_dialog.py @@ -185,12 +185,13 @@ class SettingsDialog: if IS_WIN: builder.get_object("streams_lib_frame").set_visible(False) # Themes - builder.get_object("style_frame").set_visible(True) - builder.get_object("themes_support_frame").set_visible(True) + enable_exp = self._settings.is_enable_experimental + builder.get_object("style_frame").set_visible(enable_exp) + builder.get_object("themes_support_frame").set_visible(enable_exp) self._layout_switch = builder.get_object("layout_switch") self._layout_switch.set_active(self._ext_settings.alternate_layout) self._theme_frame = builder.get_object("theme_frame") - self._theme_frame.set_visible(True) + self._theme_frame.set_visible(enable_exp) self._theme_thumbnail_image = builder.get_object("theme_thumbnail_image") self._theme_combo_box = builder.get_object("theme_combo_box") self._icon_theme_combo_box = builder.get_object("icon_theme_combo_box") diff --git a/app/ui/uicommons.py b/app/ui/uicommons.py index 3d2abcff..a27973f3 100644 --- a/app/ui/uicommons.py +++ b/app/ui/uicommons.py @@ -31,7 +31,6 @@ else: os.environ["LANGUAGE"] = settings.language st = Gtk.Settings().get_default() - st.set_property("gtk-theme-name", "MS-Windows") APP_FONT = st.get_property("gtk-font-name") st.set_property("gtk-application-prefer-dark-theme", settings.dark_mode)