Update configs; rework welcome where needed

config-theme/config/gtk-3.0/settings.ini

@@ -0,0 +1,8 @@
+[Settings]
+gtk-font-name=DejaVu Sans 8
+gtk-theme-name=kxstudio-gtk3
+gtk-icon-theme-name= Oxygen Mono Dark
+gtk-fallback-icon-theme=ubuntu-mono-dark
+gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ
+gtk-menu-images=1
+gtk-button-images=1

config-theme/gtkrc-2.0-kxstudio

@@ -8,5 +8,11 @@ style "user-font"
 }
 widget_class "*" style "user-font"
 
-gtk-theme-name="QtCurve"
 gtk-font-name="DejaVu Sans 8"
+gtk-theme-name="QtCurve"
+
+gtk-icon-theme-name="Oxygen Mono Dark"
+gtk-fallback-icon-theme="ubuntu-mono-dark"
+gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ
+gtk-menu-images=1
+gtk-button-images=1

config-theme/mozilla/firefox/default/chrome/userContent.css

@@ -0,0 +1,5 @@
+input {
+    color: white !important;
+    background: black !important;
+}
+

config/akonadi/akonadiserverrc

@@ -0,0 +1,6 @@
+[%General]
+Driver=QMYSQL
+
+[QMYSQL]
+Name=akonadi
+StartServer=false

config/kde/share/autostart/akonaditray.desktop

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Categories=Qt;KDE;Utility;
+Exec=akonaditray
+Icon=akonadi
+Name=Akonaditray
+GenericName=Akonadi Tray Utility
+Hidden=true

config/kde/share/autostart/kactivitymanagerd.desktop

@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Service
+Icon=preferences-activities
+X-KDE-ServiceTypes=
+X-DBUS-StartupType=Unique
+X-KDE-StartupNotify=false
+Exec=kactivitymanagerd
+Name=Activity Manager
+Comment=The activity management backend
+Hidden=true

config/kde/share/autostart/kaddressbookmigrator.desktop

@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=kaddressbookmigrator
+Exec=kaddressbookmigrator --disable-autostart
+Type=Application
+Comment=Tool to migrate the old kresource based address book to Akonadi.
+Terminal=false
+NoDisplay=true
+X-KDE-autostart-condition=kaddressbookmigratorrc:Startup:EnableAutostart:true
+OnlyShowIn=KDE;
+Hidden=true

config/kde/share/autostart/nepomukserver.desktop

@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Service
+Exec=nepomukserver
+X-KDE-StartupNotify=false
+X-KDE-autostart-condition=nepomukserverrc:Basic Settings:Start Nepomuk:true
+OnlyShowIn=KDE;
+X-KDE-autostart-phase=1
+Name=Nepomuk Server
+Comment=The Nepomuk Server providing Storage services and strigi controlling
+Hidden=true

config/kde/share/config/nepomukserverrc

@@ -9,3 +9,4 @@ autostart=false
 
 [main Settings]
 Maximum memory=10
+Used Soprano Backend=virtuosobackend

kxstudio-gtk3.css

@@ -1,272 +0,0 @@
-/* KXStudio-Gtk3 color scheme */
-@define-color active_text   #FFFFFF;
-@define-color inactive_text #646464;
-
-@define-color button_background          #1C1C1C;
-@define-color button_border              #383838;
-@define-color button_text                #F0F0F0;
-@define-color button_hover_border        #686868;
-@define-color button_active_background   #2F2F2F;
-@define-color button_active_border       #2F2F2F;
-@define-color button_active_text         #FFFFFF;
-@define-color button_inactive_background #181818;
-@define-color button_inactive_border     #303030;
-@define-color button_inactive_text       #646464;
-
-@define-color check_border              #212121;
-@define-color check_border_hover        #3C3C3C;
-@define-color check_border_active       #4E4E4E;
-@define-color check_border_active_hover #636363;
-
-@define-color menu_background       #191919;
-@define-color menu_border           #2D2D2D;
-@define-color menu_hover_background #2F2F2F;
-@define-color menu_hover_border     #2F2F2F;
-@define-color menubar_border        #686868;
-
-@define-color scrollbar_background                 #1B1B1B;
-@define-color scrollbar_button_background          #F0F0F0;
-@define-color scrollbar_button_hover_background    #888888;
-@define-color scrollbar_button_inactive_background #5A5A5A;
-@define-color scrollbar_slider_background          #343434;
-@define-color scrollbar_slider_border              #686868;
-@define-color scrollbar_slider_hover_border        #909090;
-@define-color scrollbar_slider_inactive_background #1B1B1B;
-@define-color scrollbar_slider_inactive_border     #222222;
-
-@define-color view_background                #070707;
-@define-color view_text                      #E6E6E6;
-@define-color view_hover_background          #1A1A1A;
-@define-color view_selected_background       #262626;
-@define-color view_selected_hover_background #424242;
-
-@define-color window_background #111111;
-@define-color window_border     #222222;
-@define-color window_text       #F0F0F0;
-
-* {
-    engine:solidity;
-    background-color:@window_background;
-    border-color:@window_border;
-    border-radius:3px;
-    color:@window_text;
-    -solidity-style:0;
-    -solidity-gradient-top-color:@window_background;
-    -solidity-gradient-bottom-color:@window_background;
-    -solidity-highlight-color:@window_background;
-    -solidity-reflection-color:@window_background;
-    -solidity-shadow-color:@window_background;
-}
-*:active {
-    color:@active_text;
-}
-*:insensitive {
-    color:@inactive_text;
-}
-
-.button {
-    background-color:@button_background;
-    border-color:@button_border;
-    color:@button_text;
-    -solidity-gradient-top-color:@button_background;
-    -solidity-gradient-bottom-color:@button_background;
-    -solidity-highlight-color:@button_background;
-    -solidity-reflection-color:@button_background;
-    -solidity-shadow-color:@button_background;
-}
-.button:hover {
-    border-color:@button_hover_border;
-    -solidity-highlight-color:@button_hover_border;
-}
-.button:active {
-    background-color:@button_active_background;
-    border-color:@button_active_border;
-    color:@button_active_text;
-    -solidity-gradient-top-color:@button_active_background;
-    -solidity-gradient-bottom-color:@button_active_background;
-    -solidity-highlight-color:@button_active_background;
-    -solidity-reflection-color:@button_active_background;
-    -solidity-shadow-color:@button_active_background;
-}
-.button:insensitive {
-    background-color:@button_inactive_background;
-    border-color:@button_inactive_border;
-    color:@button_inactive_text;
-    -solidity-gradient-top-color:@button_inactive_background;
-    -solidity-gradient-bottom-color:@button_inactive_background;
-    -solidity-highlight-color:@button_inactive_background;
-    -solidity-reflection-color:@button_inactive_background;
-    -solidity-shadow-color:@button_inactive_background;
-}
-
-.check, .menuitem.check,
-.radio, .menuitem.radio {
-    border-color:@check_border;
-}
-
-.check:hover, .menuitem.check:hover,
-.radio:hover, .menuitem.radio:hover {
-    border-color:@check_border_hover;
-}
-
-.check:active, .menuitem.check:active,
-.radio:active, .menuitem.radio:active {
-    border-color:@check_border_active;
-}
-
-.check:active:hover, .menuitem.check:active:hover,
-.radio:active:hover, .menuitem.radio:active:hover {
-    border-color:@check_border_active_hover;
-}
-
-.menu {
-    background-color:@menu_background;
-    border-color:@menu_border;
-}
-
-.menubar {
-    border-color:@menubar_border;
-    -solidity-radius:5;
-}
-
-.menuitem {
-    padding:2px;
-    -GtkMenuItem-arrow-scaling: 0.5;
-}
-.menuitem:hover {
-    background-color:@menu_hover_background;
-    border-color:@menu_hover_border;
-    -solidity-gradient-top-color:@menu_hover_background;
-    -solidity-gradient-bottom-color:@menu_hover_background;
-    -solidity-highlight-color:@menu_hover_background;
-    -solidity-reflection-color:@menu_hover_background;
-    -solidity-shadow-color:@menu_hover_background;
-}
-/* override menuitem:hover */
-.menubar:hover {
-    border-color:@menubar_border;
-}
-
-.notebook tab {
-    background-color:@button_background;
-    border-color:@window_background;
-    padding:4px;
-    -solidity-style:3;
-    -solidity-gradient-top-color:@button_background;
-    -solidity-gradient-bottom-color:@button_background;
-    -solidity-highlight-color:@window_border;
-    -solidity-reflection-color:@button_background;
-    -solidity-shadow-color:@button_background;
-}
-.notebook tab:active {
-    background-color:@window_background;
-    border-color:@button_background;
-}
-
-/*.progressbar {
-    background-color:@scrollbar_background;
-    -solidity-gradient-top-color:@scrollbar_background;
-    -solidity-gradient-bottom-color:@scrollbar_background;
-    -solidity-highlight-color:@scrollbar_background;
-    -solidity-reflection-color:@scrollbar_background;
-    -solidity-shadow-color:@scrollbar_background;
-}*/
-/* FIXME */
-.progressbar {
-    background-color:@scrollbar_slider_background;
-    border-color:@scrollbar_slider_border;
-    -solidity-gradient-top-color:@scrollbar_slider_background;
-    -solidity-gradient-bottom-color:@scrollbar_slider_background;
-    -solidity-highlight-color:@scrollbar_slider_background;
-    -solidity-reflection-color:@scrollbar_slider_background;
-    -solidity-shadow-color:@scrollbar_slider_background;
-}
-
-.rubberband {
-  /* TODO */
-}
-
-.separator {
-    color:@window_border;
-    -solidity-style:0;
-}
-
-.scrollbar {
-    background-color:@scrollbar_background;
-    -solidity-radius:5;
-    -solidity-gradient-top-color:@scrollbar_background;
-    -solidity-gradient-bottom-color:@scrollbar_background;
-    -solidity-highlight-color:@scrollbar_background;
-    -solidity-reflection-color:@scrollbar_background;
-    -solidity-shadow-color:@scrollbar_background;
-    -GtkScrollbar-has-backward-stepper:true;
-    -GtkScrollbar-has-forward-stepper:true;
-    -GtkRange-slider-width:12px;
-    -GtkRange-trough-border:0;
-}
-.scrollbar.button {
-    color:@scrollbar_button_background;
-}
-.scrollbar.button:hover {
-    color:@scrollbar_button_hover_background;
-}
-.scrollbar.button:insensitive {
-    color:@scrollbar_button_inactive_background;
-}
-.scrollbar.slider {
-    background-color:@scrollbar_slider_background;
-    border-color:@scrollbar_slider_border;
-    -solidity-gradient-top-color:@scrollbar_slider_background;
-    -solidity-gradient-bottom-color:@scrollbar_slider_background;
-    -solidity-highlight-color:@scrollbar_slider_background;
-    -solidity-reflection-color:@scrollbar_slider_background;
-    -solidity-shadow-color:@scrollbar_slider_background;
-}
-.scrollbar.slider:hover {
-    border-color:@scrollbar_slider_hover_border;
-}
-.scrollbar.slider:insensitive {
-    background-color:@scrollbar_slider_inactive_background;
-    border-color:@scrollbar_slider_inactive_border;
-    -solidity-gradient-top-color:@scrollbar_slider_inactive_background;
-    -solidity-gradient-bottom-color:@scrollbar_slider_inactive_background;
-    -solidity-highlight-color:@scrollbar_slider_inactive_background;
-    -solidity-reflection-color:@scrollbar_slider_inactive_background;
-    -solidity-shadow-color:@scrollbar_slider_inactive_background;
-}
-.scrollbar.trough {
-    background-color:@window_background;
-    border-color:@window_background;
-    -solidity-gradient-top-color:@window_background;
-    -solidity-gradient-bottom-color:@window_background;
-    -solidity-highlight-color:@window_background;
-    -solidity-reflection-color:@window_background;
-    -solidity-shadow-color:@window_background;
-}
-
-.toolbar {
-    padding:2px;
-}
-.toolbar .button {
-    padding:4px;
-}
-
-.view, .entry {
-    background-color:@view_background;
-    color:@view_text;
-    padding:3px;
-    -solidity-gradient-top-color:@view_background;
-    -solidity-gradient-bottom-color:@view_background;
-    -solidity-highlight-color:@view_background;
-    -solidity-reflection-color:@view_background;
-    -solidity-shadow-color:@view_background;
-}
-.view:hover, .entry:hover {
-    background-color:@view_hover_background;
-}
-.view:selected, .entry:selected {
-    background-color:@view_selected_background;
-}
-.view:hover:selected, .entry:hover:selected {
-    background-color:@view_selected_hover_background;
-}

welcome/Makefile

@@ -3,7 +3,7 @@
 all: ui_welcome.py
 
 ui_welcome.py:
-	pyuic4 -o ui_welcome.py welcome.ui
+	pyuic4 -w -o ui_welcome.py welcome.ui
 
 clean:
 	rm -f ui_welcome.py

welcome/kxstudio-welcome

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-exec python /usr/share/kxstudio/welcome/welcome.py "$@"
+exec python3 /usr/share/kxstudio/welcome/welcome.py "$@"

welcome/welcome.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Imports (Global)
@@ -15,7 +15,8 @@ import ui_welcome
 HOME = os.getenv("HOME")
 PWD  = sys.path[0]
 
-CONFIG_DIR = "/usr/share/kxstudio/config"
+CONFIG_DIR       = "/usr/share/kxstudio/config"
+CONFIG_THEME_DIR = "/usr/share/kxstudio/config-theme"
 
 ID_GROUP_SETTINGS = 0
 ID_GROUP_THEME    = 1
@@ -28,79 +29,95 @@ ID_PIXMAP_DONE    = 2
 
 # ----------------------------------------------
 
+CONFIG_SMALL = (
+  "bash_aliases",
+  "pulse/client.conf",
+  "pulse/daemon.conf",
+)
+
 CONFIG_ALL = (
   "asoundrc",
   "bash_aliases",
   "jackdrc",
   "lmmsrc.xml",
 
-  "ardour2/ardour.rc",
+  "akonadi/akonadiserverrc",
   "audacity-data/audacity.cfg",
   "bcast/Cinelerra_rc",
   "ccutie/Cinecutie_rc",
-  "composite/composite.conf",
   "hydrogen/hydrogen.conf",
+  "Loomer/Aspect.xml",
+  "Loomer/Manifold.xml",
+  "Loomer/Resound.xml",
+  "Loomer/Sequent.xml",
+  "Loomer/Shift2.xml",
+  "Loomer/String.xml",
   "mplayer/config",
-  "non-daw/options",
-  "non-mixer/options",
-  "OOMidi/OOMidi.cfg",
-  "openoffice.org/3/user/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu",
-  "openoffice.org/3/user/registry/data/org/openoffice/Office/UI.xcu",
-  "phasex/phasex.cfg",
   "pulse/client.conf",
   "pulse/daemon.conf",
-  "renoise/V2.7.1/Config.xml",
+  "renoise/V2.8.0/Config.xml",
   "traverso/Traverso-DAW/Traverso.ini",
 
-  "config/ardour3/ardour.rc",
   "config/audacious/config",
   "config/Clementine/Clementine.conf",
   "config/jack/conf.xml",
-  "config/kde.org/libphonon.conf",
-  "config/Modartt/Pianoteq36.prefs",
+  "config/linuxsampler.org/Qsampler.conf",
   "config/Modartt/Pianoteq36 PLAY.prefs",
+  "config/Modartt/Pianoteq40.prefs",
   "config/rncbc.org/QjackCtl.conf",
   "config/rncbc.org/Qsynth.conf",
   "config/rosegardenmusic/Rosegarden.conf",
+  "config/smplayer/smplayer.ini",
   "config/vlc/vlcrc",
 
-  "Loomer/Aspect.xml",
-  "Loomer/Manifold.xml",
-  "Loomer/Resound.xml",
-  "Loomer/Sequent.xml",
-  "Loomer/Shift2.xml",
-  "Loomer/String.xml",
-
   "kde/env/qt-graphicssystem.sh",
-  #"kde/share/apps/dolphin/dolphinui.rc",
-  #"kde/share/config/dolphinrc",
+  "kde/share/apps/dolphin/dolphinui.rc",
+  "kde/share/autostart/akonaditray.desktop",
+  "kde/share/autostart/kactivitymanagerd.desktop",
+  "kde/share/autostart/kaddressbookmigrator.desktop",
+  "kde/share/autostart/nepomukserver.desktop",
+  "kde/share/config/dolphinrc",
   "kde/share/config/kdedrc",
+  "kde/share/config/kdeglobals",
   "kde/share/config/kickoffrc",
   "kde/share/config/klipperrc",
   "kde/share/config/knotifyrc",
+  "kde/share/config/konversationrc",
+  "kde/share/config/krunnerrc",
   "kde/share/config/ksmserverrc",
   "kde/share/config/kwalletrc",
+  "kde/share/config/kwinrc",
   "kde/share/config/nepomukserverrc",
+  "kde/share/config/oxygenrc",
   "kde/share/config/taskmanagerrulesrc",
-  "kde/share/config/yakuakerc",
-)
-
-CONFIG_SMALL = (
-  #"asoundrc",
-  "bash_aliases",
+  "kde/share/config/yakuakerc"
 )
 
 CONFIG_THEME = (
   "fonts.conf",
-  "gtkrc-2.0-kde4",
+  "gtkrc-2.0-kxstudio",
   "kderc",
 
+  "ardour2/ardour.rc",
+  "composite/composite.conf",
+  "hydrogen/hydrogen.conf",
+  "mozilla/firefox/default/chrome/userContent.css",
+  "non-daw/options",
+  "non-mixer/options",
+  "phasex/phasex.cfg",
   "qt/qtrc",
+  "traverso/Traverso-DAW/Traverso.ini",
 
+  "config/ardour3/ardour.rc",
+  "config/gtk-3.0/settings.ini",
   "config/kde.org/systemsettings.conf",
+  "config/Nokia/QtCreator.ini"
   "config/qtcurve/gtk-icons",
   "config/qtcurve/stylerc",
   "config/qtcurve/windowBorderSizes",
+  "config/rncbc.org/QjackCtl.conf",
+  "config/rncbc.org/Qsynth.conf",
+  "config/rosegardenmusic/Rosegarden.conf",
   "config/Trolltech.conf",
 
   "kde/env/gtk2-engines-qtcurve.rc.sh",
@@ -153,12 +170,15 @@ def do_copy_basic():
 def do_copy_theme(copy_all=False):
   for sfile in CONFIG_THEME:
     create_folder_for_file(sfile)
-    os.system("cp '%s/%s' '%s/.%s'" % (CONFIG_DIR, sfile, HOME, sfile))
+    os.system("cp '%s/%s' '%s/.%s'" % (CONFIG_THEME_DIR, sfile, HOME, sfile))
 
   for sfile in CONFIG_THEME_ALL:
     create_folder_for_file(sfile)
     if (copy_all or not os.path.exists(os.path.join(HOME, sfile))):
-      os.system("cp '%s/%s' '%s/.%s'" % (CONFIG_DIR, sfile, HOME, sfile))
+      os.system("cp '%s/%s' '%s/.%s'" % (CONFIG_THEME_DIR, sfile, HOME, sfile))
+
+  # FIXME
+  os.system("cp '%s/mozilla/firefox/default/chrome/userContent.css' '%s/mozilla/firefox/*.default/chrome/'" % (CONFIG_THEME_DIR, HOME))
 
   os.system('gconftool-2 -t str -s /apps/metacity/general/theme "KXStudio"')
   os.system('gconftool-2 -t str -s /apps/metacity/general/button_layout "close,minimize,maximize:menu"')
@@ -177,7 +197,7 @@ def do_wine_stuff():
     os.system("wineboot")
     #os.system("sed -i 's/\[drivers32\]/\[drivers32\]\nMSACM.vorbis=vorbis.acm/' ~/.wine/drive_c/windows/system.ini")
 
-    if (os.path.exists("/usr/lib/wine/wineasio.dll.so") or os.path.exists("/usr/lib32/wine/wineasio.dll.so")):
+    if (os.path.exists("/usr/lib/i386-linux-gnu/wine/wineasio.dll.so") or os.path.exists("/usr/lib/x86_64-linux-gnu/wine/wineasio.dll.so")):
       os.system("regsvr32 wineasio.dll")
 
     if (os.path.exists("/usr/bin/winetricks")):
@@ -328,7 +348,7 @@ class WelcomeW(QWizard, ui_welcome.Ui_WelcomeW):
         settings.setValue("FirstRun", False)
 
     def loadSettings(self):
-        self.restoreGeometry(settings.value("Geometry").toByteArray())
+        self.restoreGeometry(settings.value("Geometry", ""))
 
     def closeEvent(self, event):
         self.saveSettings()