From 1a9478c6e1b77b05814af8fa02cd563a5da8946b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 16:23:58 -0600 Subject: Fix FTBFS resulting from KCModule rename --- doc/kinfocenter/samba/index.docbook | 2 +- kcontrol/access/kcmaccess.h | 2 +- .../accessibility/accessibilityconfigwidget.ui | 2 +- kcontrol/arts/arts.cpp | 2 +- kcontrol/arts/arts.h | 2 +- kcontrol/background/main.h | 2 +- kcontrol/bell/bell.h | 2 +- kcontrol/clock/main.h | 2 +- kcontrol/colors/colorscm.h | 2 +- kcontrol/componentchooser/kcm_componentchooser.h | 2 +- kcontrol/crypto/crypto.h | 2 +- kcontrol/css/kcmcss.h | 2 +- kcontrol/display/display.cpp | 2 +- kcontrol/display/display.h | 2 +- kcontrol/displayconfig/displayconfig.cpp | 2 +- kcontrol/dnssd/configdialog.ui | 4 +- kcontrol/ebrowsing/filteropts.h | 2 +- kcontrol/ebrowsing/main.h | 2 +- kcontrol/ebrowsing/plugins/ikws/ikwsopts.h | 2 +- kcontrol/energy/energy.h | 2 +- kcontrol/filetypes/filetypesview.h | 2 +- kcontrol/fonts/fonts.h | 2 +- kcontrol/hwmanager/hwmanager.h | 2 +- kcontrol/icons/icons.h | 2 +- kcontrol/icons/iconthemes.h | 2 +- kcontrol/icons/main.h | 2 +- kcontrol/info/info.h | 2 +- kcontrol/info/memory.h | 2 +- kcontrol/input/mouse.h | 2 +- kcontrol/ioslaveinfo/kcmioslaveinfo.h | 2 +- kcontrol/joystick/joystick.h | 2 +- kcontrol/kcontrol/kcrootonly.h | 2 +- kcontrol/kcontrol/modules.cpp | 2 +- kcontrol/kcontrol/modules.h | 2 +- kcontrol/kcontrol/proxywidget.cpp | 2 +- kcontrol/kded/kcmkded.h | 2 +- kcontrol/keys/keyconfig.h | 2 +- kcontrol/keys/main.h | 2 +- kcontrol/kfontinst/kcmfontinst/KCmFontInst.h | 2 +- kcontrol/kicker/hidingconfig.h | 2 +- kcontrol/kicker/lookandfeelconfig.h | 2 +- kcontrol/kicker/lookandfeeltab_kcm.h | 2 +- kcontrol/kicker/main.cpp | 2 +- kcontrol/kicker/menuconfig.h | 2 +- kcontrol/kicker/positionconfig.h | 2 +- kcontrol/kio/cache.h | 2 +- kcontrol/kio/kcookiesmain.h | 2 +- kcontrol/kio/kcookiesmanagement.h | 2 +- kcontrol/kio/kcookiespolicies.h | 2 +- kcontrol/kio/kproxydlg.h | 2 +- kcontrol/kio/main.cpp | 2 +- kcontrol/kio/main.h | 2 +- kcontrol/kio/netpref.h | 2 +- kcontrol/kio/smbrodlg.h | 2 +- kcontrol/kio/socks.h | 2 +- kcontrol/kio/useragentdlg.h | 2 +- kcontrol/knotify/knotify.h | 2 +- kcontrol/konq/behaviour.h | 2 +- kcontrol/konq/browser.cpp | 2 +- kcontrol/konq/browser.h | 2 +- kcontrol/konq/desktop.h | 2 +- kcontrol/konq/desktopbehavior_impl.h | 2 +- kcontrol/konq/fontopts.h | 2 +- kcontrol/konq/previews.h | 2 +- kcontrol/konq/rootopts.h | 2 +- kcontrol/konqhtml/appearance.h | 2 +- kcontrol/konqhtml/filteropts.h | 2 +- kcontrol/konqhtml/htmlopts.h | 2 +- kcontrol/konqhtml/javaopts.h | 2 +- kcontrol/konqhtml/jsopts.h | 2 +- kcontrol/konqhtml/khttpoptdlg.h | 2 +- kcontrol/konqhtml/main.h | 2 +- kcontrol/konqhtml/pluginopts.h | 2 +- kcontrol/konsole/kcmkonsole.h | 2 +- kcontrol/kthememanager/kthememanager.h | 2 +- kcontrol/launch/kcmlaunch.h | 2 +- kcontrol/locale/toplevel.h | 2 +- kcontrol/nics/nic.h | 2 +- kcontrol/performance/kcmperformance.h | 2 +- kcontrol/performance/system.h | 2 +- kcontrol/privacy/privacy.h | 2 +- kcontrol/randr/krandrmodule.cpp | 2 +- kcontrol/samba/main.cpp | 2 +- kcontrol/screensaver/scrnsave.h | 2 +- kcontrol/smartcard/smartcard.h | 2 +- kcontrol/smserver/kcmsmserver.h | 2 +- kcontrol/spellchecking/spellchecking.h | 2 +- kcontrol/style/kcmstyle.h | 2 +- kcontrol/taskbar/kcmtaskbar.h | 2 +- kcontrol/tdm/main.h | 2 +- kcontrol/usbview/kcmusb.h | 2 +- kcontrol/view1394/view1394.h | 2 +- kcontrol/xinerama/kcmxinerama.h | 2 +- kdepasswd/kcm/main.h | 2 +- khelpcenter/htmlsearch/kcmhtmlsearch.h | 2 +- khotkeys/kcontrol/kcmkhotkeys.cpp | 2 +- khotkeys/kcontrol/kcmkhotkeys.h | 2 +- kioslave/cgi/kcmcgi/kcmcgi.h | 2 +- kioslave/media/CMakeLists.txt | 2 +- kioslave/media/Makefile.am | 2 +- kioslave/media/kcmodule/CMakeLists.txt | 45 --- kioslave/media/kcmodule/Makefile.am | 21 -- kioslave/media/kcmodule/main.cpp | 104 ------- kioslave/media/kcmodule/main.h | 45 --- kioslave/media/kcmodule/managermodule.cpp | 213 ------------- kioslave/media/kcmodule/managermodule.h | 49 --- kioslave/media/kcmodule/managermoduleview.ui | 343 --------------------- kioslave/media/kcmodule/media.desktop | 197 ------------ kioslave/media/kcmodule/mimetypelistboxitem.cpp | 35 --- kioslave/media/kcmodule/mimetypelistboxitem.h | 37 --- kioslave/media/kcmodule/notifiermodule.cpp | 230 -------------- kioslave/media/kcmodule/notifiermodule.h | 58 ---- kioslave/media/kcmodule/notifiermoduleview.ui | 171 ---------- kioslave/media/kcmodule/serviceconfigdialog.cpp | 151 --------- kioslave/media/kcmodule/serviceconfigdialog.h | 48 --- kioslave/media/kcmodule/serviceview.ui | 248 --------------- kioslave/media/tdecmodule/CMakeLists.txt | 45 +++ kioslave/media/tdecmodule/Makefile.am | 21 ++ kioslave/media/tdecmodule/main.cpp | 104 +++++++ kioslave/media/tdecmodule/main.h | 45 +++ kioslave/media/tdecmodule/managermodule.cpp | 213 +++++++++++++ kioslave/media/tdecmodule/managermodule.h | 49 +++ kioslave/media/tdecmodule/managermoduleview.ui | 343 +++++++++++++++++++++ kioslave/media/tdecmodule/media.desktop | 197 ++++++++++++ kioslave/media/tdecmodule/mimetypelistboxitem.cpp | 35 +++ kioslave/media/tdecmodule/mimetypelistboxitem.h | 37 +++ kioslave/media/tdecmodule/notifiermodule.cpp | 230 ++++++++++++++ kioslave/media/tdecmodule/notifiermodule.h | 58 ++++ kioslave/media/tdecmodule/notifiermoduleview.ui | 171 ++++++++++ kioslave/media/tdecmodule/serviceconfigdialog.cpp | 151 +++++++++ kioslave/media/tdecmodule/serviceconfigdialog.h | 48 +++ kioslave/media/tdecmodule/serviceview.ui | 248 +++++++++++++++ .../sidebar/trees/history_module/kcmhistory.h | 2 +- ksplashml/kcmksplash/main.cpp | 2 +- kxkb/kcmlayout.h | 2 +- kxkb/kcmmisc.h | 2 +- tdeprint/printmgr/kcmprintmgr.h | 2 +- twin/kcmtwin/twindecoration/twindecoration.cpp | 2 +- twin/kcmtwin/twindecoration/twindecoration.h | 2 +- twin/kcmtwin/twinoptions/main.h | 2 +- twin/kcmtwin/twinoptions/mouse.h | 2 +- twin/kcmtwin/twinoptions/windows.h | 2 +- twin/kcmtwin/twinrules/kcm.h | 2 +- 143 files changed, 2107 insertions(+), 2107 deletions(-) delete mode 100644 kioslave/media/kcmodule/CMakeLists.txt delete mode 100644 kioslave/media/kcmodule/Makefile.am delete mode 100644 kioslave/media/kcmodule/main.cpp delete mode 100644 kioslave/media/kcmodule/main.h delete mode 100644 kioslave/media/kcmodule/managermodule.cpp delete mode 100644 kioslave/media/kcmodule/managermodule.h delete mode 100644 kioslave/media/kcmodule/managermoduleview.ui delete mode 100644 kioslave/media/kcmodule/media.desktop delete mode 100644 kioslave/media/kcmodule/mimetypelistboxitem.cpp delete mode 100644 kioslave/media/kcmodule/mimetypelistboxitem.h delete mode 100644 kioslave/media/kcmodule/notifiermodule.cpp delete mode 100644 kioslave/media/kcmodule/notifiermodule.h delete mode 100644 kioslave/media/kcmodule/notifiermoduleview.ui delete mode 100644 kioslave/media/kcmodule/serviceconfigdialog.cpp delete mode 100644 kioslave/media/kcmodule/serviceconfigdialog.h delete mode 100644 kioslave/media/kcmodule/serviceview.ui create mode 100644 kioslave/media/tdecmodule/CMakeLists.txt create mode 100644 kioslave/media/tdecmodule/Makefile.am create mode 100644 kioslave/media/tdecmodule/main.cpp create mode 100644 kioslave/media/tdecmodule/main.h create mode 100644 kioslave/media/tdecmodule/managermodule.cpp create mode 100644 kioslave/media/tdecmodule/managermodule.h create mode 100644 kioslave/media/tdecmodule/managermoduleview.ui create mode 100644 kioslave/media/tdecmodule/media.desktop create mode 100644 kioslave/media/tdecmodule/mimetypelistboxitem.cpp create mode 100644 kioslave/media/tdecmodule/mimetypelistboxitem.h create mode 100644 kioslave/media/tdecmodule/notifiermodule.cpp create mode 100644 kioslave/media/tdecmodule/notifiermodule.h create mode 100644 kioslave/media/tdecmodule/notifiermoduleview.ui create mode 100644 kioslave/media/tdecmodule/serviceconfigdialog.cpp create mode 100644 kioslave/media/tdecmodule/serviceconfigdialog.h create mode 100644 kioslave/media/tdecmodule/serviceview.ui diff --git a/doc/kinfocenter/samba/index.docbook b/doc/kinfocenter/samba/index.docbook index 36df1da1b..69d7b91b9 100644 --- a/doc/kinfocenter/samba/index.docbook +++ b/doc/kinfocenter/samba/index.docbook @@ -190,7 +190,7 @@ often, or which user opened the most files or whatever. &Matthias.Hoelzer-Kluepfel; &Matthias.Hoelzer-Kluepfel.mail; Use of TDEProcess instead of popen, and more error checking: &David.Faure; &David.Faure.mail; -Conversion to kcmodule, added tab pages 2,3,4, bug +Conversion to tdecmodule, added tab pages 2,3,4, bug fixed: &Alexander.Neundorf; &Alexander.Neundorf.mail; diff --git a/kcontrol/access/kcmaccess.h b/kcontrol/access/kcmaccess.h index 0553979bc..14a441a59 100644 --- a/kcontrol/access/kcmaccess.h +++ b/kcontrol/access/kcmaccess.h @@ -9,7 +9,7 @@ #define __kcmaccess_h__ -#include +#include #include diff --git a/kcontrol/accessibility/accessibilityconfigwidget.ui b/kcontrol/accessibility/accessibilityconfigwidget.ui index 43914c62d..0aa9c5ffd 100644 --- a/kcontrol/accessibility/accessibilityconfigwidget.ui +++ b/kcontrol/accessibility/accessibilityconfigwidget.ui @@ -1613,7 +1613,7 @@ Please note that on slow machines this may cause a "lag" between the event causi - kcmodule.h + tdecmodule.h kurlrequester.h klineedit.h kpushbutton.h diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp index feea9b1d1..86086cbd9 100644 --- a/kcontrol/arts/arts.cpp +++ b/kcontrol/arts/arts.cpp @@ -38,7 +38,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcontrol/arts/arts.h b/kcontrol/arts/arts.h index fe30b4961..cd2b4f2ff 100644 --- a/kcontrol/arts/arts.h +++ b/kcontrol/arts/arts.h @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include diff --git a/kcontrol/background/main.h b/kcontrol/background/main.h index a879becd8..9fdba57b8 100644 --- a/kcontrol/background/main.h +++ b/kcontrol/background/main.h @@ -10,7 +10,7 @@ #ifndef __Bgnd_h_Included__ #define __Bgnd_h_Included__ -#include +#include class TDEConfig; class BGDialog; diff --git a/kcontrol/bell/bell.h b/kcontrol/bell/bell.h index da7d184bc..844698e9e 100644 --- a/kcontrol/bell/bell.h +++ b/kcontrol/bell/bell.h @@ -21,7 +21,7 @@ #ifndef __bell_h__ #define __bell_h__ -#include "kcmodule.h" +#include "tdecmodule.h" class TQCheckBox; class KIntNumInput; diff --git a/kcontrol/clock/main.h b/kcontrol/clock/main.h index 82e501dfc..7754da34f 100644 --- a/kcontrol/clock/main.h +++ b/kcontrol/clock/main.h @@ -21,7 +21,7 @@ #ifndef main_included #define main_included -#include +#include class Dtime; class Tzone; diff --git a/kcontrol/colors/colorscm.h b/kcontrol/colors/colorscm.h index edc14325d..abfd3d403 100644 --- a/kcontrol/colors/colorscm.h +++ b/kcontrol/colors/colorscm.h @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include "widgetcanvas.h" diff --git a/kcontrol/componentchooser/kcm_componentchooser.h b/kcontrol/componentchooser/kcm_componentchooser.h index 905c0a9b5..001306506 100644 --- a/kcontrol/componentchooser/kcm_componentchooser.h +++ b/kcontrol/componentchooser/kcm_componentchooser.h @@ -16,7 +16,7 @@ #ifndef _KCM_KTEXTEDITORCHOOSER_H_ #define _KCM_KTEXTEDITORCHOOSER_H_ -#include +#include #include "componentchooser.h" diff --git a/kcontrol/crypto/crypto.h b/kcontrol/crypto/crypto.h index efcef6072..c94d1f24d 100644 --- a/kcontrol/crypto/crypto.h +++ b/kcontrol/crypto/crypto.h @@ -33,7 +33,7 @@ #include #include -#include +#include #include class TQGridLayout; diff --git a/kcontrol/css/kcmcss.h b/kcontrol/css/kcmcss.h index 585452b3e..da93fcdf5 100644 --- a/kcontrol/css/kcmcss.h +++ b/kcontrol/css/kcmcss.h @@ -21,7 +21,7 @@ #include -#include +#include class CSSConfigDialog; diff --git a/kcontrol/display/display.cpp b/kcontrol/display/display.cpp index f9a27ca92..b3e15d021 100644 --- a/kcontrol/display/display.cpp +++ b/kcontrol/display/display.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/kcontrol/display/display.h b/kcontrol/display/display.h index bb5d44e6f..42373a42f 100644 --- a/kcontrol/display/display.h +++ b/kcontrol/display/display.h @@ -20,7 +20,7 @@ #ifndef DISPLAY_H #define DISPLAY_H -#include +#include class TQTabWidget; diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp index 046ad9e16..017b1537c 100644 --- a/kcontrol/displayconfig/displayconfig.cpp +++ b/kcontrol/displayconfig/displayconfig.cpp @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include diff --git a/kcontrol/dnssd/configdialog.ui b/kcontrol/dnssd/configdialog.ui index fdb6ebf6f..0066f7d90 100644 --- a/kcontrol/dnssd/configdialog.ui +++ b/kcontrol/dnssd/configdialog.ui @@ -316,11 +316,11 @@ is configured with 'Browse local network' option above. radioButton2_2_toggled(bool) - kcmodule.h + tdecmodule.h - kcmodule.h + tdecmodule.h keditlistbox.h klineedit.h klineedit.h diff --git a/kcontrol/ebrowsing/filteropts.h b/kcontrol/ebrowsing/filteropts.h index 144525e9b..3ea140ffc 100644 --- a/kcontrol/ebrowsing/filteropts.h +++ b/kcontrol/ebrowsing/filteropts.h @@ -23,7 +23,7 @@ #ifndef __FILTEROPTS_H___ #define __FILTEROPTS_H___ -#include +#include class TQListBox; diff --git a/kcontrol/ebrowsing/main.h b/kcontrol/ebrowsing/main.h index 94780c995..4234ffe3e 100644 --- a/kcontrol/ebrowsing/main.h +++ b/kcontrol/ebrowsing/main.h @@ -25,7 +25,7 @@ #ifndef __MAIN_H__ #define __MAIN_H__ -#include +#include class KURIFilter; diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h index 2150e4883..be82459b6 100644 --- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h +++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h @@ -23,7 +23,7 @@ #include #include -#include +#include #include class FilterOptionsUI; diff --git a/kcontrol/energy/energy.h b/kcontrol/energy/energy.h index 8faeaca1a..982171846 100644 --- a/kcontrol/energy/energy.h +++ b/kcontrol/energy/energy.h @@ -15,7 +15,7 @@ #define __Energy_h_Included__ #include -#include +#include class TQCheckBox; class KIntNumInput; diff --git a/kcontrol/filetypes/filetypesview.h b/kcontrol/filetypes/filetypesview.h index db1116b29..e7217c4ba 100644 --- a/kcontrol/filetypes/filetypesview.h +++ b/kcontrol/filetypes/filetypesview.h @@ -5,7 +5,7 @@ #include #include -#include +#include #include "typeslistitem.h" diff --git a/kcontrol/fonts/fonts.h b/kcontrol/fonts/fonts.h index d69035b4c..f8b5e8fe6 100644 --- a/kcontrol/fonts/fonts.h +++ b/kcontrol/fonts/fonts.h @@ -10,7 +10,7 @@ #include -#include +#include #include #include #include diff --git a/kcontrol/hwmanager/hwmanager.h b/kcontrol/hwmanager/hwmanager.h index 7e395d0a3..0a3fa2221 100644 --- a/kcontrol/hwmanager/hwmanager.h +++ b/kcontrol/hwmanager/hwmanager.h @@ -25,7 +25,7 @@ #include #endif -#include +#include #include #include diff --git a/kcontrol/icons/icons.h b/kcontrol/icons/icons.h index 3c824af33..aafa31748 100644 --- a/kcontrol/icons/icons.h +++ b/kcontrol/icons/icons.h @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include diff --git a/kcontrol/icons/iconthemes.h b/kcontrol/icons/iconthemes.h index 8eb9716fe..f648bf02c 100644 --- a/kcontrol/icons/iconthemes.h +++ b/kcontrol/icons/iconthemes.h @@ -20,7 +20,7 @@ #define ICONTHEMES_H #include -#include +#include #include #include diff --git a/kcontrol/icons/main.h b/kcontrol/icons/main.h index 431f40254..515cc47e9 100644 --- a/kcontrol/icons/main.h +++ b/kcontrol/icons/main.h @@ -27,7 +27,7 @@ #include -#include +#include class IconModule : public TDECModule { diff --git a/kcontrol/info/info.h b/kcontrol/info/info.h index d26c7ba1f..36503a556 100644 --- a/kcontrol/info/info.h +++ b/kcontrol/info/info.h @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include "config.h" diff --git a/kcontrol/info/memory.h b/kcontrol/info/memory.h index aaeb56f86..9ffc9956c 100644 --- a/kcontrol/info/memory.h +++ b/kcontrol/info/memory.h @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include diff --git a/kcontrol/input/mouse.h b/kcontrol/input/mouse.h index 809ac4817..32c8f6c10 100644 --- a/kcontrol/input/mouse.h +++ b/kcontrol/input/mouse.h @@ -48,7 +48,7 @@ #include "logitechmouse.h" #endif -#include +#include #include "kmousedlg.h" #include "themepage.h" diff --git a/kcontrol/ioslaveinfo/kcmioslaveinfo.h b/kcontrol/ioslaveinfo/kcmioslaveinfo.h index b587c39ec..04db54566 100644 --- a/kcontrol/ioslaveinfo/kcmioslaveinfo.h +++ b/kcontrol/ioslaveinfo/kcmioslaveinfo.h @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcontrol/joystick/joystick.h b/kcontrol/joystick/joystick.h index 2a201b28f..eadccd0fd 100644 --- a/kcontrol/joystick/joystick.h +++ b/kcontrol/joystick/joystick.h @@ -21,7 +21,7 @@ #ifndef _JOYSTICK_H_ #define _JOYSTICK_H_ -#include +#include class JoyWidget; diff --git a/kcontrol/kcontrol/kcrootonly.h b/kcontrol/kcontrol/kcrootonly.h index e167c4452..6fca1d1a2 100644 --- a/kcontrol/kcontrol/kcrootonly.h +++ b/kcontrol/kcontrol/kcrootonly.h @@ -2,7 +2,7 @@ #ifndef _kcontrol_kcrootonly_ #define _kcontrol_kcrootonly_ -#include +#include class KCRootOnly: public TDECModule { public: diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp index 047fa75e6..8382c5d81 100644 --- a/kcontrol/kcontrol/modules.cpp +++ b/kcontrol/kcontrol/modules.cpp @@ -37,7 +37,7 @@ #include "modules.moc" #include "global.h" #include "proxywidget.h" -#include +#include #include "kcrootonly.h" #include diff --git a/kcontrol/kcontrol/modules.h b/kcontrol/kcontrol/modules.h index f2bce1d6d..b5b4a8085 100644 --- a/kcontrol/kcontrol/modules.h +++ b/kcontrol/kcontrol/modules.h @@ -20,7 +20,7 @@ #ifndef MODULES_H #define MODULES_H -#include +#include #include #include #include diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp index 5d540d2c6..1d975f4a3 100644 --- a/kcontrol/kcontrol/proxywidget.cpp +++ b/kcontrol/kcontrol/proxywidget.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kcontrol/kded/kcmkded.h b/kcontrol/kded/kcmkded.h index 86f5aaf94..4f49ab140 100644 --- a/kcontrol/kded/kcmkded.h +++ b/kcontrol/kded/kcmkded.h @@ -21,7 +21,7 @@ #include -#include +#include class KListView; diff --git a/kcontrol/keys/keyconfig.h b/kcontrol/keys/keyconfig.h index 5595e76e2..d1760728d 100644 --- a/kcontrol/keys/keyconfig.h +++ b/kcontrol/keys/keyconfig.h @@ -13,7 +13,7 @@ #include #include -//#include +//#include #include class TQCheckBox; diff --git a/kcontrol/keys/main.h b/kcontrol/keys/main.h index eec44060f..5299e3884 100644 --- a/kcontrol/keys/main.h +++ b/kcontrol/keys/main.h @@ -25,7 +25,7 @@ #define __keys_main_h #include -#include +#include class CommandShortcutsModule; class ShortcutsModule; diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h index 1483ee4de..14cb8ee58 100644 --- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h +++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h @@ -34,7 +34,7 @@ #endif #include -#include +#include #include #include #include diff --git a/kcontrol/kicker/hidingconfig.h b/kcontrol/kicker/hidingconfig.h index 342da29b9..8aee0fb51 100644 --- a/kcontrol/kicker/hidingconfig.h +++ b/kcontrol/kicker/hidingconfig.h @@ -18,7 +18,7 @@ #ifndef __hidingconfig_h__ #define __hidingconfig_h__ -#include +#include class HidingTab; diff --git a/kcontrol/kicker/lookandfeelconfig.h b/kcontrol/kicker/lookandfeelconfig.h index c3190ce08..cd368ce36 100644 --- a/kcontrol/kicker/lookandfeelconfig.h +++ b/kcontrol/kicker/lookandfeelconfig.h @@ -18,7 +18,7 @@ #ifndef __lookandfeelconfig_h__ #define __lookandfeelconfig_h__ -#include +#include class LookAndFeelTab; diff --git a/kcontrol/kicker/lookandfeeltab_kcm.h b/kcontrol/kicker/lookandfeeltab_kcm.h index ecf7ff0e6..d4d113687 100644 --- a/kcontrol/kicker/lookandfeeltab_kcm.h +++ b/kcontrol/kicker/lookandfeeltab_kcm.h @@ -18,7 +18,7 @@ #ifndef __lookandfeelconfig_h__ #define __lookandfeelconfig_h__ -#include +#include class LookAndFeelTab; diff --git a/kcontrol/kicker/main.cpp b/kcontrol/kicker/main.cpp index dda2f08db..b24be9ba7 100644 --- a/kcontrol/kicker/main.cpp +++ b/kcontrol/kicker/main.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kcontrol/kicker/menuconfig.h b/kcontrol/kicker/menuconfig.h index 30178b18c..e6e548f83 100644 --- a/kcontrol/kicker/menuconfig.h +++ b/kcontrol/kicker/menuconfig.h @@ -18,7 +18,7 @@ #ifndef __menuconfig_h__ #define __menuconfig_h__ -#include +#include class MenuTab; diff --git a/kcontrol/kicker/positionconfig.h b/kcontrol/kicker/positionconfig.h index 13d026f3b..6c4ec3680 100644 --- a/kcontrol/kicker/positionconfig.h +++ b/kcontrol/kicker/positionconfig.h @@ -18,7 +18,7 @@ #ifndef __positionconfig_h__ #define __positionconfig_h__ -#include +#include class PositionTab; diff --git a/kcontrol/kio/cache.h b/kcontrol/kio/cache.h index f7d0dd695..03a4d0581 100644 --- a/kcontrol/kio/cache.h +++ b/kcontrol/kio/cache.h @@ -22,7 +22,7 @@ #ifndef CACHE_H #define CACHE_H -#include +#include class CacheDlgUI; diff --git a/kcontrol/kio/kcookiesmain.h b/kcontrol/kio/kcookiesmain.h index e11cf1a52..14b202ff4 100644 --- a/kcontrol/kio/kcookiesmain.h +++ b/kcontrol/kio/kcookiesmain.h @@ -6,7 +6,7 @@ #ifndef __KCOOKIESMAIN_H #define __KCOOKIESMAIN_H -#include +#include class TQTabWidget; class DCOPClient; diff --git a/kcontrol/kio/kcookiesmanagement.h b/kcontrol/kio/kcookiesmanagement.h index 3b8696e2c..51e31fbee 100644 --- a/kcontrol/kio/kcookiesmanagement.h +++ b/kcontrol/kio/kcookiesmanagement.h @@ -28,7 +28,7 @@ #include #include -#include +#include class DCOPClient; diff --git a/kcontrol/kio/kcookiespolicies.h b/kcontrol/kio/kcookiespolicies.h index 04a45672a..50ce7a62b 100644 --- a/kcontrol/kio/kcookiespolicies.h +++ b/kcontrol/kio/kcookiespolicies.h @@ -27,7 +27,7 @@ #define __KCOOKIESPOLICIES_H #include -#include +#include #include "policydlg.h" diff --git a/kcontrol/kio/kproxydlg.h b/kcontrol/kio/kproxydlg.h index ecb99a77a..30bdb935b 100644 --- a/kcontrol/kio/kproxydlg.h +++ b/kcontrol/kio/kproxydlg.h @@ -24,7 +24,7 @@ #include -#include +#include class TQTabWidget; diff --git a/kcontrol/kio/main.cpp b/kcontrol/kio/main.cpp index 06d02d4f1..5a19288d9 100644 --- a/kcontrol/kio/main.cpp +++ b/kcontrol/kio/main.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include "kcookiesmain.h" diff --git a/kcontrol/kio/main.h b/kcontrol/kio/main.h index 1122af019..ca2e15da0 100644 --- a/kcontrol/kio/main.h +++ b/kcontrol/kio/main.h @@ -21,7 +21,7 @@ #ifndef MYMAIN_H #define MYMAIN_H -#include +#include #include class TQTabWidget; diff --git a/kcontrol/kio/netpref.h b/kcontrol/kio/netpref.h index ebe9ee3b6..30584a598 100644 --- a/kcontrol/kio/netpref.h +++ b/kcontrol/kio/netpref.h @@ -1,7 +1,7 @@ #ifndef KIOPREFERENCES_H #define KIOPREFERENCES_H -#include +#include class TQLabel; class TQVGroupBox; diff --git a/kcontrol/kio/smbrodlg.h b/kcontrol/kio/smbrodlg.h index 2174cfc18..1c9d0347d 100644 --- a/kcontrol/kio/smbrodlg.h +++ b/kcontrol/kio/smbrodlg.h @@ -25,7 +25,7 @@ #include #include -#include +#include class KComboBox; diff --git a/kcontrol/kio/socks.h b/kcontrol/kio/socks.h index 165d1d329..f5c5cb2a4 100644 --- a/kcontrol/kio/socks.h +++ b/kcontrol/kio/socks.h @@ -26,7 +26,7 @@ #include #endif -#include +#include #include "socksbase.h" diff --git a/kcontrol/kio/useragentdlg.h b/kcontrol/kio/useragentdlg.h index 39885956d..746a8524a 100644 --- a/kcontrol/kio/useragentdlg.h +++ b/kcontrol/kio/useragentdlg.h @@ -25,7 +25,7 @@ #ifndef _USERAGENTDLG_H #define _USERAGENTDLG_H -#include +#include class TDEConfig; class FakeUASProvider; diff --git a/kcontrol/knotify/knotify.h b/kcontrol/knotify/knotify.h index a37393f97..12aa35333 100644 --- a/kcontrol/knotify/knotify.h +++ b/kcontrol/knotify/knotify.h @@ -25,7 +25,7 @@ #include -#include +#include #include class TQCheckBox; diff --git a/kcontrol/konq/behaviour.h b/kcontrol/konq/behaviour.h index e9bded291..edc723c53 100644 --- a/kcontrol/konq/behaviour.h +++ b/kcontrol/konq/behaviour.h @@ -19,7 +19,7 @@ #ifndef __BEHAVIOUR_H__ #define __BEHAVIOUR_H__ -#include +#include class TQCheckBox; class TQLabel; diff --git a/kcontrol/konq/browser.cpp b/kcontrol/konq/browser.cpp index e25b6143d..96f370d77 100644 --- a/kcontrol/konq/browser.cpp +++ b/kcontrol/konq/browser.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include "behaviour.h" #include "fontopts.h" diff --git a/kcontrol/konq/browser.h b/kcontrol/konq/browser.h index 5e4aadebf..928fc6eeb 100644 --- a/kcontrol/konq/browser.h +++ b/kcontrol/konq/browser.h @@ -20,7 +20,7 @@ #ifndef __KBROWSER_OPTIONS_H__ #define __KBROWSER_OPTIONS_H__ -#include +#include class TDEConfig; class TQTabWidget; diff --git a/kcontrol/konq/desktop.h b/kcontrol/konq/desktop.h index c7c10de0a..b7a05c3bc 100644 --- a/kcontrol/konq/desktop.h +++ b/kcontrol/konq/desktop.h @@ -19,7 +19,7 @@ #ifndef __desktop_h__ #define __desktop_h__ -#include +#include class TQSpinBox; class TQLabel; diff --git a/kcontrol/konq/desktopbehavior_impl.h b/kcontrol/konq/desktopbehavior_impl.h index 1dcb3bee1..640d6a2c3 100644 --- a/kcontrol/konq/desktopbehavior_impl.h +++ b/kcontrol/konq/desktopbehavior_impl.h @@ -24,7 +24,7 @@ #include "desktopbehavior.h" #include "tqlistview.h" #include -#include +#include class DesktopBehavior : public DesktopBehaviorBase { diff --git a/kcontrol/konq/fontopts.h b/kcontrol/konq/fontopts.h index 4e1575652..0a0a18823 100644 --- a/kcontrol/konq/fontopts.h +++ b/kcontrol/konq/fontopts.h @@ -37,7 +37,7 @@ #include #include -#include +#include class TQCheckBox; class TQRadioButton; diff --git a/kcontrol/konq/previews.h b/kcontrol/konq/previews.h index 10c5e32a7..a1b4772bf 100644 --- a/kcontrol/konq/previews.h +++ b/kcontrol/konq/previews.h @@ -33,7 +33,7 @@ Configuration of the maximum image size #include -#include +#include class TDEConfig; class TQCheckBox; diff --git a/kcontrol/konq/rootopts.h b/kcontrol/konq/rootopts.h index d4429c1dd..5fe1fe5c7 100644 --- a/kcontrol/konq/rootopts.h +++ b/kcontrol/konq/rootopts.h @@ -15,7 +15,7 @@ #include -#include +#include #include #include diff --git a/kcontrol/konqhtml/appearance.h b/kcontrol/konqhtml/appearance.h index 6bca1908f..c833e8111 100644 --- a/kcontrol/konqhtml/appearance.h +++ b/kcontrol/konqhtml/appearance.h @@ -14,7 +14,7 @@ #include #include -#include +#include class TQSpinBox; class KFontCombo; diff --git a/kcontrol/konqhtml/filteropts.h b/kcontrol/konqhtml/filteropts.h index fae52b53f..eba3dad7d 100644 --- a/kcontrol/konqhtml/filteropts.h +++ b/kcontrol/konqhtml/filteropts.h @@ -18,7 +18,7 @@ #ifndef FILTEROPTS_H #define FILTEROPTS_H -#include +#include class TQListBox; class TQPushButton; diff --git a/kcontrol/konqhtml/htmlopts.h b/kcontrol/konqhtml/htmlopts.h index 151607419..5a582e68c 100644 --- a/kcontrol/konqhtml/htmlopts.h +++ b/kcontrol/konqhtml/htmlopts.h @@ -26,7 +26,7 @@ #include #include -#include +#include class TQRadioButton; class KIntNumInput; diff --git a/kcontrol/konqhtml/javaopts.h b/kcontrol/konqhtml/javaopts.h index b93a77e86..0c179edd0 100644 --- a/kcontrol/konqhtml/javaopts.h +++ b/kcontrol/konqhtml/javaopts.h @@ -15,7 +15,7 @@ #ifndef __JAVAOPTS_H__ #define __JAVAOPTS_H__ -#include +#include #include "domainlistview.h" #include "policies.h" diff --git a/kcontrol/konqhtml/jsopts.h b/kcontrol/konqhtml/jsopts.h index f5735294d..000f7f770 100644 --- a/kcontrol/konqhtml/jsopts.h +++ b/kcontrol/konqhtml/jsopts.h @@ -10,7 +10,7 @@ #ifndef __JSOPTS_H__ #define __JSOPTS_H__ -#include +#include #include "domainlistview.h" #include "jspolicies.h" diff --git a/kcontrol/konqhtml/khttpoptdlg.h b/kcontrol/konqhtml/khttpoptdlg.h index 0a3507085..3342f434b 100644 --- a/kcontrol/konqhtml/khttpoptdlg.h +++ b/kcontrol/konqhtml/khttpoptdlg.h @@ -7,7 +7,7 @@ #include #include -#include +#include #include diff --git a/kcontrol/konqhtml/main.h b/kcontrol/konqhtml/main.h index 182ac2756..2be4963fb 100644 --- a/kcontrol/konqhtml/main.h +++ b/kcontrol/konqhtml/main.h @@ -26,7 +26,7 @@ #ifndef __MAIN_H__ #define __MAIN_H__ -#include +#include class KJavaOptions; class KJavaScriptOptions; diff --git a/kcontrol/konqhtml/pluginopts.h b/kcontrol/konqhtml/pluginopts.h index 37aeceeda..efd3e0157 100644 --- a/kcontrol/konqhtml/pluginopts.h +++ b/kcontrol/konqhtml/pluginopts.h @@ -19,7 +19,7 @@ class TDEConfig; class TQCheckBox; -#include +#include #include "nsconfigwidget.h" class TQBoxLayout; diff --git a/kcontrol/konsole/kcmkonsole.h b/kcontrol/konsole/kcmkonsole.h index 71b0fb7a7..561cb4502 100644 --- a/kcontrol/konsole/kcmkonsole.h +++ b/kcontrol/konsole/kcmkonsole.h @@ -18,7 +18,7 @@ #ifndef KCMKONSOLE_H #define KCMKONSOLE_H -#include +#include #include "kcmkonsoledialog.h" diff --git a/kcontrol/kthememanager/kthememanager.h b/kcontrol/kthememanager/kthememanager.h index 3ca337300..56b25f94c 100644 --- a/kcontrol/kthememanager/kthememanager.h +++ b/kcontrol/kthememanager/kthememanager.h @@ -19,7 +19,7 @@ #ifndef KTHEMEMANAGER_H #define KTHEMEMANAGER_H -#include +#include #include #include #include diff --git a/kcontrol/launch/kcmlaunch.h b/kcontrol/launch/kcmlaunch.h index 13c980bf7..e0219ffd3 100644 --- a/kcontrol/launch/kcmlaunch.h +++ b/kcontrol/launch/kcmlaunch.h @@ -18,7 +18,7 @@ #ifndef __kcmlaunch_h__ #define __kcmlaunch_h__ -#include +#include class TQCheckBox; class TQComboBox; diff --git a/kcontrol/locale/toplevel.h b/kcontrol/locale/toplevel.h index a999d64d0..4514ecfc5 100644 --- a/kcontrol/locale/toplevel.h +++ b/kcontrol/locale/toplevel.h @@ -25,7 +25,7 @@ #ifndef __TOPLEVEL_H__ #define __TOPLEVEL_H__ -#include +#include #include class TQTabWidget; diff --git a/kcontrol/nics/nic.h b/kcontrol/nics/nic.h index 0c1939d46..f9bc2e082 100644 --- a/kcontrol/nics/nic.h +++ b/kcontrol/nics/nic.h @@ -21,7 +21,7 @@ #ifndef KCONTROL_NIC_H #define KCONTROL_NIC_H -#include +#include class TQStringList; class TQPushButton; diff --git a/kcontrol/performance/kcmperformance.h b/kcontrol/performance/kcmperformance.h index 2ae868093..a9963e18a 100644 --- a/kcontrol/performance/kcmperformance.h +++ b/kcontrol/performance/kcmperformance.h @@ -19,7 +19,7 @@ #ifndef _KCM_PERFORMANCE_H #define _KCM_PERFORMANCE_H -#include +#include namespace KCMPerformance { diff --git a/kcontrol/performance/system.h b/kcontrol/performance/system.h index 1358c8e79..cb570b506 100644 --- a/kcontrol/performance/system.h +++ b/kcontrol/performance/system.h @@ -19,7 +19,7 @@ #ifndef _KCM_PERF_SYSTEM_H #define _KCM_PERF_SYSTEM_H -#include +#include #include "system_ui.h" diff --git a/kcontrol/privacy/privacy.h b/kcontrol/privacy/privacy.h index 1df7c4acc..3300fec6d 100644 --- a/kcontrol/privacy/privacy.h +++ b/kcontrol/privacy/privacy.h @@ -21,7 +21,7 @@ #ifndef _PRIVACY_H_ #define _PRIVACY_H_ -#include +#include #include #include "kcmprivacydialog.h" diff --git a/kcontrol/randr/krandrmodule.cpp b/kcontrol/randr/krandrmodule.cpp index 474bc0416..3eaf46f8b 100644 --- a/kcontrol/randr/krandrmodule.cpp +++ b/kcontrol/randr/krandrmodule.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcontrol/samba/main.cpp b/kcontrol/samba/main.cpp index 2db372feb..65b5957e1 100644 --- a/kcontrol/samba/main.cpp +++ b/kcontrol/samba/main.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include diff --git a/kcontrol/screensaver/scrnsave.h b/kcontrol/screensaver/scrnsave.h index 72a00c410..a622cd673 100644 --- a/kcontrol/screensaver/scrnsave.h +++ b/kcontrol/screensaver/scrnsave.h @@ -10,7 +10,7 @@ #define __SCRNSAVE_H__ #include -#include +#include #include "kssmonitor.h" #include "saverconfig.h" diff --git a/kcontrol/smartcard/smartcard.h b/kcontrol/smartcard/smartcard.h index 8a7367341..0a4b7d704 100644 --- a/kcontrol/smartcard/smartcard.h +++ b/kcontrol/smartcard/smartcard.h @@ -27,7 +27,7 @@ #include -#include +#include #include "smartcardbase.h" #include "nosmartcardbase.h" diff --git a/kcontrol/smserver/kcmsmserver.h b/kcontrol/smserver/kcmsmserver.h index c66caaa93..c346033c6 100644 --- a/kcontrol/smserver/kcmsmserver.h +++ b/kcontrol/smserver/kcmsmserver.h @@ -21,7 +21,7 @@ #ifndef __kcmsmserver_h__ #define __kcmsmserver_h__ -#include +#include class SMServerConfigImpl; diff --git a/kcontrol/spellchecking/spellchecking.h b/kcontrol/spellchecking/spellchecking.h index 19aadbc76..10db546fd 100644 --- a/kcontrol/spellchecking/spellchecking.h +++ b/kcontrol/spellchecking/spellchecking.h @@ -19,7 +19,7 @@ #ifndef __spellchecking_h__ #define __spellchecking_h__ -#include "kcmodule.h" +#include "tdecmodule.h" class KSpellConfig; diff --git a/kcontrol/style/kcmstyle.h b/kcontrol/style/kcmstyle.h index 44fb68c0e..81bddf550 100644 --- a/kcontrol/style/kcmstyle.h +++ b/kcontrol/style/kcmstyle.h @@ -30,7 +30,7 @@ #include #include -#include +#include #include "stylepreview.h" #include "menupreview.h" diff --git a/kcontrol/taskbar/kcmtaskbar.h b/kcontrol/taskbar/kcmtaskbar.h index 8b313c0e6..1f9a1e813 100644 --- a/kcontrol/taskbar/kcmtaskbar.h +++ b/kcontrol/taskbar/kcmtaskbar.h @@ -21,7 +21,7 @@ #include -#include +#include class TaskbarConfigUI; class TaskBarSettings; diff --git a/kcontrol/tdm/main.h b/kcontrol/tdm/main.h index dbfb936dc..144d1db20 100644 --- a/kcontrol/tdm/main.h +++ b/kcontrol/tdm/main.h @@ -27,7 +27,7 @@ #include #include -#include +#include class TDMAppearanceWidget; class TDMFontWidget; diff --git a/kcontrol/usbview/kcmusb.h b/kcontrol/usbview/kcmusb.h index 3b81a3f80..eb33a475c 100644 --- a/kcontrol/usbview/kcmusb.h +++ b/kcontrol/usbview/kcmusb.h @@ -14,7 +14,7 @@ #include -#include +#include class TQListView; class TQListViewItem; diff --git a/kcontrol/view1394/view1394.h b/kcontrol/view1394/view1394.h index c88722b82..6d015bce8 100644 --- a/kcontrol/view1394/view1394.h +++ b/kcontrol/view1394/view1394.h @@ -21,7 +21,7 @@ #ifndef VIEW1394_H_ #define VIEW1394_H_ -#include +#include #include #include diff --git a/kcontrol/xinerama/kcmxinerama.h b/kcontrol/xinerama/kcmxinerama.h index 707bba28c..83fdf6de9 100644 --- a/kcontrol/xinerama/kcmxinerama.h +++ b/kcontrol/xinerama/kcmxinerama.h @@ -21,7 +21,7 @@ #ifndef _KCM_XINERAMA_H #define _KCM_XINERAMA_H -#include +#include #include #include diff --git a/kdepasswd/kcm/main.h b/kdepasswd/kcm/main.h index a2b8b5ba9..350c42820 100644 --- a/kdepasswd/kcm/main.h +++ b/kdepasswd/kcm/main.h @@ -19,7 +19,7 @@ #ifndef MAIN_H #define MAIN_H -#include +#include #include "main_widget.h" diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.h b/khelpcenter/htmlsearch/kcmhtmlsearch.h index c4073388f..476807db2 100644 --- a/khelpcenter/htmlsearch/kcmhtmlsearch.h +++ b/khelpcenter/htmlsearch/kcmhtmlsearch.h @@ -22,7 +22,7 @@ #define __kcmhtmlsearch_h__ -#include +#include class TQLineEdit; diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp index 46f96c9fc..ae2411b09 100644 --- a/khotkeys/kcontrol/kcmkhotkeys.cpp +++ b/khotkeys/kcontrol/kcmkhotkeys.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/khotkeys/kcontrol/kcmkhotkeys.h b/khotkeys/kcontrol/kcmkhotkeys.h index fdc12a8f2..92bf49efb 100644 --- a/khotkeys/kcontrol/kcmkhotkeys.h +++ b/khotkeys/kcontrol/kcmkhotkeys.h @@ -11,7 +11,7 @@ #ifndef _KCMKHOTKEYS_H_ #define _KCMKHOTKEYS_H_ -#include +#include #include #include diff --git a/kioslave/cgi/kcmcgi/kcmcgi.h b/kioslave/cgi/kcmcgi/kcmcgi.h index f6ad715b3..ccd2f2f3d 100644 --- a/kioslave/cgi/kcmcgi/kcmcgi.h +++ b/kioslave/cgi/kcmcgi/kcmcgi.h @@ -18,7 +18,7 @@ #ifndef KCMCGI_H #define KCMCGI_H -#include +#include class TQListBox; class TQPushButton; diff --git a/kioslave/media/CMakeLists.txt b/kioslave/media/CMakeLists.txt index 41821df59..6c39b47fe 100644 --- a/kioslave/media/CMakeLists.txt +++ b/kioslave/media/CMakeLists.txt @@ -14,7 +14,7 @@ add_subdirectory( mediamanager ) add_subdirectory( medianotifier ) add_subdirectory( mounthelper ) add_subdirectory( kfile-plugin ) -add_subdirectory( kcmodule ) +add_subdirectory( tdecmodule ) add_subdirectory( mimetypes ) add_subdirectory( services ) add_subdirectory( propsdlgplugin ) diff --git a/kioslave/media/Makefile.am b/kioslave/media/Makefile.am index e727fc4a3..978f17cbc 100644 --- a/kioslave/media/Makefile.am +++ b/kioslave/media/Makefile.am @@ -3,7 +3,7 @@ PROPSDLGPLUGINDIR = propsdlgplugin endif SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \ - kfile-plugin kcmodule mimetypes services $(PROPSDLGPLUGINDIR) + kfile-plugin tdecmodule mimetypes services $(PROPSDLGPLUGINDIR) INCLUDES = -I$(srcdir)/libmediacommon $(all_includes) METASOURCES = AUTO diff --git a/kioslave/media/kcmodule/CMakeLists.txt b/kioslave/media/kcmodule/CMakeLists.txt deleted file mode 100644 index 4a1dc2345..000000000 --- a/kioslave/media/kcmodule/CMakeLists.txt +++ /dev/null @@ -1,45 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kioslave/media/libmediacommon - ${CMAKE_SOURCE_DIR}/kioslave/media/libmediacommon - ${CMAKE_BINARY_DIR} - ${TDE_INCLUDE_DIR} - ${TQT_INCLUDE_DIRS} -) - -link_directories( - ${TQT_LIBRARY_DIRS} -) - - -##### other data ################################ - -install( FILES media.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) - - -##### kcm_media (module) ######################## - -set( target kcm_media ) - -set( ${target}_SRCS - notifiermodule.cpp notifiermoduleview.ui serviceconfigdialog.cpp - serviceview.ui mimetypelistboxitem.cpp managermodule.cpp - managermoduleview.ui main.cpp -) - -tde_add_kpart( ${target} AUTOMOC - SOURCES ${${target}_SRCS} - LINK mediacommon-static kio-shared - DESTINATION ${PLUGIN_INSTALL_DIR} -) diff --git a/kioslave/media/kcmodule/Makefile.am b/kioslave/media/kcmodule/Makefile.am deleted file mode 100644 index 72f9f385c..000000000 --- a/kioslave/media/kcmodule/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDES = -I$(srcdir)/../libmediacommon -I../libmediacommon $(all_includes) -METASOURCES = AUTO - -kde_module_LTLIBRARIES = kcm_media.la -kcm_media_la_SOURCES = notifiermodule.cpp notifiermoduleview.ui \ - serviceconfigdialog.cpp serviceview.ui \ - mimetypelistboxitem.cpp \ - managermodule.cpp managermoduleview.ui \ - main.cpp - -kcm_media_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -kcm_media_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) - -noinst_HEADERS = notifiermodule.h managermodule.h \ - serviceconfigdialog.h mimetypelistboxitem.h \ - main.h - -xdg_apps_DATA = media.desktop - -messages: rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/kcmmedia.pot diff --git a/kioslave/media/kcmodule/main.cpp b/kioslave/media/kcmodule/main.cpp deleted file mode 100644 index 9036583df..000000000 --- a/kioslave/media/kcmodule/main.cpp +++ /dev/null @@ -1,104 +0,0 @@ -/* This file is part of the KDE Project - Copyright (c) 2005 Jean-Remy Falleri - Copyright (c) 2005 Kévin Ottens - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include "main.h" - -#include -#include - -#include -#include -#include - -#include - -#include "notifiermodule.h" -#include "managermodule.h" - - -typedef KGenericFactory MediaFactory; -K_EXPORT_COMPONENT_FACTORY( kcm_media, MediaFactory( "kcmmedia" ) ) - - -MediaModule::MediaModule( TQWidget *parent, const char *name, const TQStringList& ) - : TDECModule(MediaFactory::instance(), parent, name ) -{ - TDEGlobal::locale()->insertCatalogue("kio_media"); - TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); - TQTabWidget *tab = new TQTabWidget( this ); - - layout->addWidget( tab ); - - - - m_notifierModule = new NotifierModule( this, "notifier" ); - tab->addTab( m_notifierModule, i18n( "&Notifications" ) ); - connect( m_notifierModule, TQT_SIGNAL( changed( bool ) ), - this, TQT_SLOT( moduleChanged( bool ) ) ); - - m_managerModule = new ManagerModule( this, "manager" ); - tab->addTab( m_managerModule, i18n( "&Advanced" ) ); - connect( m_managerModule, TQT_SIGNAL( changed( bool ) ), - this, TQT_SLOT( moduleChanged( bool ) ) ); - - - - TDEAboutData * about = new TDEAboutData("kcmmedia", - I18N_NOOP("Storage Media"), - "0.6", - I18N_NOOP("Storage Media Control Panel Module"), - TDEAboutData::License_GPL_V2, - I18N_NOOP("(c) 2005 Jean-Remy Falleri")); - about->addAuthor("Jean-Remy Falleri", I18N_NOOP("Maintainer"), "jr.falleri@laposte.net"); - about->addAuthor("Kevin Ottens", 0, "ervin ipsquad net"); - about->addAuthor("Valentine Sinitsyn", 0, "e_val@inbox.ru"); - about->addCredit("Achim Bohnet", I18N_NOOP("Help for the application design")); - - setAboutData( about ); -} - -void MediaModule::load() -{ - m_notifierModule->load(); - m_managerModule->load(); -} - -void MediaModule::save() -{ - m_notifierModule->save(); - m_managerModule->save(); -} - -void MediaModule::defaults() -{ - m_notifierModule->defaults(); - m_managerModule->defaults(); -} - -void MediaModule::moduleChanged( bool state ) -{ - emit changed( state ); -} - -TQString MediaModule::quickHelp() const -{ - return i18n("FIXME : Write me..."); -} - -#include "main.moc" diff --git a/kioslave/media/kcmodule/main.h b/kioslave/media/kcmodule/main.h deleted file mode 100644 index b5297aed5..000000000 --- a/kioslave/media/kcmodule/main.h +++ /dev/null @@ -1,45 +0,0 @@ -/* This file is part of the KDE Project - Copyright (c) 2005 Jean-Remy Falleri - Copyright (c) 2005 Kvin Ottens - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef _MAIN_H_ -#define _MAIN_H_ - -#include - -class MediaModule : public TDECModule -{ - Q_OBJECT - -public: - MediaModule( TQWidget *parent, const char *name, const TQStringList& ); - - virtual void load(); - virtual void save(); - virtual void defaults(); - virtual TQString quickHelp() const; - -protected slots: - void moduleChanged( bool state ); - -private: - TDECModule *m_notifierModule; - TDECModule *m_managerModule; -}; - -#endif diff --git a/kioslave/media/kcmodule/managermodule.cpp b/kioslave/media/kcmodule/managermodule.cpp deleted file mode 100644 index 4c9859889..000000000 --- a/kioslave/media/kcmodule/managermodule.cpp +++ /dev/null @@ -1,213 +0,0 @@ -/* This file is part of the KDE Project - Copyright (c) 2005 Kvin Ottens - Copyright (c) 2006 Valentine Sinitsyn - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include - -#include "managermodule.h" - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "managermoduleview.h" -#include "mediamanagersettings.h" - -ManagerModule::ManagerModule( TQWidget* parent, const char* name ) - : TDECModule( parent, name ) -{ - view = new ManagerModuleView( this ); - - addConfig( MediaManagerSettings::self(), view ); - -#ifndef COMPILE_HALBACKEND - TQString hal_text = view->kcfg_HalBackendEnabled->text(); - hal_text += " ("+i18n("No support for HAL on this system")+")"; - view->kcfg_HalBackendEnabled->setText( hal_text ); -#endif - view->kcfg_HalBackendEnabled->setEnabled( false ); - -#ifndef COMPILE_LINUXCDPOLLING - TQString poll_text = view->kcfg_CdPollingEnabled->text(); - poll_text += " ("+i18n("No support for CD polling on this system")+")"; - view->kcfg_CdPollingEnabled->setText( poll_text ); -#endif - view->kcfg_CdPollingEnabled->setEnabled( false ); - - connect( view->option_automount, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) ); - connect( view->option_ro, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) ); - connect( view->option_quiet, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) ); - connect( view->option_flush, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) ); - connect( view->option_uid, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) ); - connect( view->option_utf8, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) ); - connect( view->option_sync, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) ); - connect( view->option_atime, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) ); - connect( view->option_shortname, SIGNAL( activated(int) ), this, SLOT( emitChanged() ) ); - connect( view->option_journaling, SIGNAL( activated(int) ), this, SLOT( emitChanged() ) ); - - load(); -} - - -void ManagerModule::load() -{ - TDECModule::load(); - - TDEConfig config("mediamanagerrc"); - config.setGroup("DefaultOptions"); - - view->option_automount->setChecked( config.readBoolEntry("automount", false) ); - view->option_ro->setChecked( config.readBoolEntry("ro", false) ); - view->option_quiet->setChecked( config.readBoolEntry("quiet", false) ); - if (config.hasKey("flush")) - view->option_flush->setChecked( config.readBoolEntry("flush") ); - else - view->option_flush->setNoChange(); - view->option_uid->setChecked( config.readBoolEntry("uid", true) ); - view->option_utf8->setChecked( config.readBoolEntry("utf8", true) ); - if (config.hasKey("sync")) - view->option_sync->setChecked( config.readBoolEntry("sync") ); - else - view->option_sync->setNoChange(); - if (config.hasKey("atime")) - view->option_atime->setChecked( config.readBoolEntry("atime") ); - else - view->option_atime->setNoChange(); - - QString value; - - value = config.readEntry("shortname", "lower").lower(); - for (int i = 0; i < view->option_shortname->count(); i++) - if (view->option_shortname->text(i).lower() == value) view->option_shortname->setCurrentItem(i); - - value = config.readEntry("journaling", "ordered").lower(); - for (int i = 0; i < view->option_journaling->count(); i++) - if (view->option_journaling->text(i).lower() == value) view->option_journaling->setCurrentItem(i); - - rememberSettings(); -} - -void ManagerModule::save() -{ - TDECModule::save(); - - TDEConfig config("mediamanagerrc"); - config.setGroup("DefaultOptions"); - - config.writeEntry("automount", view->option_automount->isChecked()); - config.writeEntry("ro", view->option_ro->isChecked()); - config.writeEntry("quiet", view->option_quiet->isChecked()); - if (view->option_flush->state() == TQButton::NoChange) - config.deleteEntry("flush"); - else - config.writeEntry("flush", view->option_flush->isChecked()); - config.writeEntry("uid", view->option_uid->isChecked()); - config.writeEntry("utf8", view->option_utf8->isChecked()); - if (view->option_sync->state() == TQButton::NoChange) - config.deleteEntry("sync"); - else - config.writeEntry("sync", view->option_sync->isChecked()); - if (view->option_atime->state() == TQButton::NoChange) - config.deleteEntry("atime"); - else - config.writeEntry("atime", view->option_atime->isChecked()); - config.writeEntry("journaling", view->option_journaling->currentText().lower()); - config.writeEntry("shortname", view->option_shortname->currentText().lower()); - - rememberSettings(); - - //Well... reloadBackends is buggy with HAL, it seems to be linked - //to a bug in the unmaintained Qt3 DBUS binding ;-/ - //DCOPRef mediamanager( "kded", "mediamanager" ); - //DCOPReply reply = mediamanager.call( "reloadBackends" ); - - // So we use this hack instead... - DCOPRef kded( "kded", "kded" ); - kded.call( "unloadModule", "mediamanager" ); - kded.call( "loadModule", "mediamanager" ); - - KDirNotify_stub notifier( "*", "*" ); - notifier.FilesAdded( "media:/" ); -} - -void ManagerModule::defaults() -{ - TDECModule::defaults(); - - view->option_automount->setChecked(false); - view->option_ro->setChecked(false); - view->option_quiet->setChecked(false); - view->option_flush->setNoChange(); - view->option_uid->setChecked(true); - view->option_utf8->setChecked(true); - view->option_sync->setNoChange(); - view->option_atime->setNoChange(); - view->option_journaling->setCurrentItem(1); - view->option_shortname->setCurrentItem(0); -} - -void ManagerModule::rememberSettings() -{ - TQObjectList *options = view->queryList(0, "^option_"); - TQObject *current = 0; - TQObjectListIterator it(*options); - - settings.clear(); - while ( (current = it.current()) != 0 ) { - if (current->isA("TQCheckBox")) - settings[current] = ((TQCheckBox *)current)->state(); - else if (current->isA("TQComboBox")) - settings[current] = ((TQComboBox *)current)->currentItem(); - ++it; - } - delete options; - -} - -void ManagerModule::emitChanged() -{ - TQObjectList *options = view->queryList(0, "^option_"); - TQObject *current = 0; - TQObjectListIterator it(*options); - int value = -1; - bool somethingChanged = false; - - while ( (current = it.current()) != 0 ) { - if (current->isA("TQCheckBox")) - value = ((TQCheckBox *)current)->state(); - else if (current->isA("TQComboBox")) - value = ((TQComboBox *)current)->currentItem(); - - if (settings[current] != value) { - somethingChanged = true; - break; - } - - ++it; - } - delete options; - - emit changed(somethingChanged); -} - -#include "managermodule.moc" diff --git a/kioslave/media/kcmodule/managermodule.h b/kioslave/media/kcmodule/managermodule.h deleted file mode 100644 index a26c7a24a..000000000 --- a/kioslave/media/kcmodule/managermodule.h +++ /dev/null @@ -1,49 +0,0 @@ -/* This file is part of the KDE Project - Copyright (c) 2005 Kvin Ottens - Copyright (c) 2006 Valentine Sinitsyn - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef _MANAGERMODULE_H_ -#define _MANAGERMODULE_H_ - -#include -#include - -class ManagerModuleView; - -class ManagerModule : public TDECModule -{ - Q_OBJECT - -public: - ManagerModule( TQWidget* parent = 0, const char* name = 0); - - void load(); - void save(); - void defaults(); - -private: - void rememberSettings(); - - ManagerModuleView *view; - TQMap settings; - -private slots: - void emitChanged(); -}; - -#endif diff --git a/kioslave/media/kcmodule/managermoduleview.ui b/kioslave/media/kcmodule/managermoduleview.ui deleted file mode 100644 index afde70c75..000000000 --- a/kioslave/media/kcmodule/managermoduleview.ui +++ /dev/null @@ -1,343 +0,0 @@ - -ManagerModuleView - - - ManagerModuleView - - - - 0 - 0 - 600 - 480 - - - - ManagerModuleView - - - - unnamed - - - - kcfg_HalBackendEnabled - - - Enable HAL backend - - - Select this if you want to enable the Hardware Abstraction Layer (http://hal.freedesktop.org/wiki/Software/hal) support. - - - - - kcfg_CdPollingEnabled - - - Enable CD polling - - - Select this to enable the CD polling. - - - - - kcfg_AutostartEnabled - - - Enable medium application autostart after mount - - - Select this if you want to enable application autostart after mounting a device. - - - - - groupbox_mount - - - Mount options - - - - unnamed - - - - textLabel3 - - - Here you can specify default mount options for your storage media. Please note that some options are not supported for certain filesystems and/or medium. You will be able to redefine all these options on per-volume basis later, using Properties dialog of the corresponding volume.<br> -Some of the options are tristate. Leave them "undefined" to let KDE choose the best value depending on your media. - - - WordBreak|AlignVCenter - - - - - layout30 - - - - unnamed - - - - option_ro - - - Read only - - - By default, mount all file systems read-only. - - - - - option_uid - - - Mount as user - - - Mount this file system as user. - - - - - option_flush - - - Flushed IO - - - true - - - Always flush all data to the hot plug devices immediately and don't cache it. - - - - - option_sync - - - Synchronous - - - true - - - All I/O to the file system should be done synchronously. - - - - - option_quiet - - - Quiet - - - Attempts to chown or chmod files do not return errors, although they fail. Use with caution! - - - - - option_utf8 - - - UTF-8 charset - - - UTF8 is the filesystem safe 8-bit encoding of Unicode that is used by the console. It can be be enabled for the filesystem with this option. - - - - - layout29 - - - - unnamed - - - - text_shortname - - - Short names: - - - option_shortname - - - <h2>Defines the behaviour for creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.</h2> - -<h3><b>Lower</b></h3> -Force the short name to lower case upon display; store a long name when the short name is not all upper case. - -<h3><b>Windows 95</b></h3> -Force the short name to upper case upon display; store a long name when the short name is not all upper case. - -<h3><b>Windows NT</b></h3> -Display the shortname as is; store a long name when the short name is not all lower case or all upper case. - -<h3><b>Mixed</b></h3> -Display the short name as is; store a long name when the short name is not all upper case. - - - - - - All Data - - - - - Ordered - - - - - Writeback - - - - option_journaling - - - 1 - - - - - text_journaling - - - Journaling: - - - option_journaling - - - <h2>Specifies the journalling mode for file data. Metadata is always journaled. </h2> - -<h3><b>All Data</b></h3> - All data is committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security. - -<h3><b>Ordered</b></h3> - All data is forced directly out to the main file system prior to its metadata being committed to the journal. - -<h3><b>Write Back</b></h3> - Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal. This is rumoured to be the highest-throughput option. It guarantees internal file system integrity, however it can allow old data to appear in files after a crash and journal recovery. - - - - - - Lower - - - - - Windows 95 - - - - - Windows NT - - - - - Mixed - - - - option_shortname - - - - - - - option_automount - - - Mount automatically - - - By default, mount all file systems automatically. - - - - - option_atime - - - Access time updates - - - true - - - Update inode access time for each access. - - - - - - - - - spacer1 - - - Vertical - - - Expanding - - - - 21 - 130 - - - - - - - - kcfg_HalBackendEnabled - toggled(bool) - groupbox_mount - setEnabled(bool) - - - - kcfg_HalBackendEnabled - kcfg_CdPollingEnabled - kcfg_AutostartEnabled - option_automount - option_ro - option_quiet - option_sync - option_atime - option_flush - option_utf8 - option_uid - option_journaling - option_shortname - - - managermoduleview.ui.h - - - init() - - - diff --git a/kioslave/media/kcmodule/media.desktop b/kioslave/media/kcmodule/media.desktop deleted file mode 100644 index 4afd68cb5..000000000 --- a/kioslave/media/kcmodule/media.desktop +++ /dev/null @@ -1,197 +0,0 @@ -[Desktop Entry] -Type=Application -#DocPath= -Icon=system -Exec=kcmshell media - - -X-TDE-Library=media -X-TDE-FactoryName=media -X-TDE-ParentApp=kcontrol - -Name=Storage Media -Name[af]=Stoor Media -Name[ar]=وسائط التخزين -Name[be]=Носьбіты -Name[bg]=Съхраняващи устройства -Name[bn]=স্টোরেজ মিডিয়া -Name[bs]=Uređaji za smještaj podataka -Name[ca]=Suports d'emmagatzematge -Name[cs]=Úložná zařízení -Name[csb]=Zôpisowné media -Name[da]=Opbevaringsmedie -Name[de]=Speichermedien -Name[el]=Συσκευές αποθήκευσης -Name[eo]=Enmemoriga Medio -Name[es]=Dispositivos de almacenamiento -Name[et]=Andmekandjad -Name[eu]=Biltegiratze-euskarria -Name[fa]=رسانۀ ذخیره‌گاه -Name[fi]=Tallennusmedia -Name[fr]=Support de stockage -Name[fy]=Opslachapparaten -Name[ga]=Meán Stórais -Name[gl]=Medios de armacenaxe -Name[he]=התקנים -Name[hi]=भंडार मीडिया -Name[hr]=Mediji za pohranjivanje -Name[hu]=Tárolóeszközök -Name[is]=Geymslumiðlar -Name[it]=Dispositivi di archiviazione -Name[ja]=記憶メディア -Name[ka]=მონაცემთა შენახვის მოწყობილობები -Name[kk]=Жинақтаушы құрылғылар -Name[km]=ឧបករណ៍​ផ្ទុក -Name[lt]=Saugojimo įrenginiai -Name[lv]=Datu nesējs -Name[mk]=Медиуми за податоци -Name[ms]=Media Storan -Name[nb]=Lagringsenheter -Name[nds]=Spiekermedien -Name[ne]=भण्डारण मिडिया -Name[nl]=Opslagapparaten -Name[nn]=Lagringsmedium -Name[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ -Name[pl]=Urządzenia przechowywania danych -Name[pt]=Dispositivos de Armazenamento -Name[pt_BR]=Mídia de Armazenamento -Name[ro]=Mediu de stocare -Name[ru]=Устройства хранения данных -Name[rw]=Uburyo bwo Kubika -Name[se]=Vurkenmedia -Name[sk]=Zálohovacie médiá -Name[sl]=Nosilci za shranjevanje -Name[sr]=Складишни медијуми -Name[sr@Latn]=Skladišni medijumi -Name[sv]=Lagringsmedia -Name[ta]=சேகரிப்பு ஊடகம் -Name[tg]=Захирагоҳи маълумот -Name[th]=สื่อเก็บข้อมูล -Name[tr]=Depolama Ortamı -Name[tt]=Saqlawlı Media -Name[uk]=Пристрої зберігання інформації -Name[uz]=Saqlash uskunalari -Name[uz@cyrillic]=Сақлаш ускуналари -Name[vi]=Ổ chứa Dữ liệu -Name[wa]=Sopoirts di wårdaedje -Name[zh_CN]=存储介质 -Name[zh_TW]=儲存媒體 - -Comment=Configure Storage Media -Comment[af]=Stel Stoor Media op -Comment[ar]=إعداد وسائط التخزين -Comment[be]=Настаўленні носьбітаў -Comment[bg]=Настройване на устройствата за съхранение на информация -Comment[bn]=স্টোরেজ মিডিয়া কনফিগার করুন -Comment[bs]=Podesite prikaz uređaja -Comment[ca]=Configura els suports d'emmagatzematge -Comment[cs]=Nastavení úložných médií -Comment[csb]=Kònfigùracëjô zôpisownëch mediów -Comment[da]=Opsætning af opbevarelsesmedie -Comment[de]=Speichermedien einrichten -Comment[el]=Ρύθμιση μέσων αποθήκευσης -Comment[eo]=Agordo de enmemoriga medio -Comment[es]=Configuración de las medios de almacenamiento -Comment[et]=Salvestusandmekandjate seadistused -Comment[eu]=Konfiguratu biltegiratze-euskarria -Comment[fa]=پیکربندی رسانۀ ذخیره‌گاه -Comment[fi]=Aseta tallennusmedia -Comment[fr]=Configurer le média de stockage -Comment[fy]=Opslachmedia ynstelle -Comment[ga]=Cumraigh Meáin Stórála -Comment[gl]=Configurar Medios de Armacenaxe -Comment[he]=שינוי הגדרות מדיות אחסון -Comment[hr]=Konfiguriranje medija za pohranu -Comment[hu]=A tárolóeszközök beállítása -Comment[is]=Stillingar geymslumiðla -Comment[it]=Configura dispositivi di archiviazione -Comment[ja]=記憶メディアの設定 -Comment[ka]=შენახვის მედიის გამართვა -Comment[kk]=Жинақтаушыларды баптау -Comment[km]=កំណត់​រចនាសម្ព័ន្ធ​ឧបករណ៍​ផ្ទុក -Comment[lt]=Konfigūruoti saugojimo įrenginius -Comment[mk]=Конфигурирајте ги медиумите за податоци -Comment[nb]=Sett opp lagringsmedier -Comment[nds]=Spiekermedien instellen -Comment[ne]=भण्डारण मिडिया कन्फिगर गर्नुहोस् -Comment[nl]=Opslagmedia instellen -Comment[nn]=Set opp lagringsmedium -Comment[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ ਸੰਰਚਨਾ -Comment[pl]=Konfiguracja nośników danych -Comment[pt]=Configurar os Suportes de Armazenamento -Comment[pt_BR]=Configura as mídias de armazenamento -Comment[ro]=Configurează mediile de stocare -Comment[ru]=Настройка подключаемых устройств хранения -Comment[se]=Heivet vurkenmediaid -Comment[sk]=Nastavenie zálohovacích médií -Comment[sl]=Nastavitve nosilcev za shranjevanje -Comment[sr]=Подешавање медијума за складиштење -Comment[sr@Latn]=Podešavanje medijuma za skladištenje -Comment[sv]=Anpassa lagringsmedia -Comment[th]=ตั้งค่าสื่อบันทึก -Comment[tr]=Depolama Aygıtlarını Yapılandır -Comment[tt]=Saqlaw Cıhazların Caylaw -Comment[uk]=Налаштування пристроїв зберігання інформації -Comment[uz]=Saqlash uskunalarni moslash -Comment[uz@cyrillic]=Сақлаш ускуналарни мослаш -Comment[vi]=Cấu hình Ổ lưu trữ Dữ liệu -Comment[wa]=Apontiaedjes sopoirts di wårdaedje -Comment[zh_CN]=配置存储介质 -Comment[zh_TW]=設定儲存媒體 - -Keywords=storage,media,usb,cdrom,device -Keywords[ar]=تخزين,وسائط,usb,قرص مدمج cdrom,جهاز -Keywords[be]=Носьбіт,Прылада,storage,media,usb,cdrom,device -Keywords[bg]=съхранение, информация, компактдиск, устройство, данни, storage, media, usb, cdrom, device -Keywords[bs]=storage,media,usb,cdrom,device,uređaji,mediji -Keywords[ca]=emmagatzematge,suport,usb,cdrom,dispositiu -Keywords[cs]=úložiště,média,USB,CDROM,zařízení -Keywords[csb]=pòdôwczi,trzëmanié pòdôwków,zôpisowné media,usb,cdrom,ùrządzenié,nëk -Keywords[da]=opbevaring,medie,usb,cdrom,enhed -Keywords[de]=Speicher,Medien,Medium,USB,CD-Rom,cdrom,Gerät -Keywords[el]=αποθήκευση,μέσο,usb,cdrom,συσκευή -Keywords[eo]=memorigilo,medio,usb,lumdisko,aparato -Keywords[es]=almacenamiento,medios,usb,cdrom,dispositivo -Keywords[et]=salvestamine,andmekandja,usb,cd,seade -Keywords[eu]=biltegiratzea,euskarriak,usb,cdrom,gailua -Keywords[fa]=ذخیره‌گاه، رسانه، گذرگاه سریال جهانی، دیسک فشرده، دستگاه -Keywords[fi]=varasto,media,usb,cdrom,laite -Keywords[fr]=stockage,media,média,medium,usb,cdrom,périphérique -Keywords[fy]=storage,opslach,media,usb,cd-rom,kompakt-skiif,device,apparaat,mp3-speler,usb-stick,geheugenkaart -Keywords[ga]=stóráil,stóras,meáin,meán,usb,cdrom,dlúthdhiosca,gléas -Keywords[gl]=armacenaxe,medios,usb,cdrom,dispositivo -Keywords[he]=storage,media,usb,cdrom,device,מדיה,התקן,סידירום,תקליטור -Keywords[hr]=storage,media,usb,cdrom,device,pohrana,snimanje,mediji,uređaj -Keywords[hu]=tároló,adathordozó,USB,CD-ROM,eszköz -Keywords[is]=geymsla,miðill,usb,cdrom,tæki -Keywords[it]=storage,media,usb,cdrom,dispositivi,dvd,penna usb,memory stick,stick -Keywords[ja]=記憶,メディア,usb,cdrom,デバイス -Keywords[km]=ឧបករណ៍​ផ្ទុក, usb,ស៊ីឌីរ៉ូម,ឧបករណ៍ -Keywords[lt]=storage,media,usb,cdrom,device,saugojimas,media,įrenginiai,usb -Keywords[mk]=storage,media,usb,cdrom,device,медиуми,усб,цдром,уред -Keywords[nb]=lagring,media,usb,CD-spiller,CD-ROM,enheter,minnepinner,harddisker,HD,eksterne harddisker,zip-disker -Keywords[nds]=Spieker,Medien,USB,CDROM,Reedschap -Keywords[ne]=भण्डारण, मिडिया,usb,cdrom, यन्त्र -Keywords[nl]=storage,opslag,media,usb,cd-rom,device,apparaat,mp3-speler,usb-stick,geheugenkaart -Keywords[nn]=lagring,media,usb,CD-spiller,CD-ROM,einingar,minnepinnar,harddiskar,HD,eksterne harddiskar,zip-diskar -Keywords[pa]=ਸਟੋਰੇਜ਼,ਮੀਡਿਆ,ਜੰਤਰ,usb,cdrom -Keywords[pl]=dane,przechowywanie danych,nośnik danych,nośniki danych,usb,cdrom,urządzenie -Keywords[pt]=armazenamento,discos,usb,cdrom,dispositivo -Keywords[pt_BR]=armazenamento,mídia,usb,cd-rom,device,dispositivo -Keywords[ro]=stocare,mediu,usb,cdrom,dispozitiv -Keywords[ru]=storage,media,usb,cdrom,device,устройство хранения -Keywords[sl]=shranjevanje,nosilec,usb,cdrom,naprava -Keywords[sr]=storage,media,usb,cdrom,device,складиштење,медијум,уређај -Keywords[sr@Latn]=storage,media,usb,cdrom,device,skladištenje,medijum,uređaj -Keywords[sv]=lagring,media,usb,cdrom,enhet -Keywords[th]=ที่เก็บข้อมูล,สื่อ,ยูเอสบี,,ซีดีรอม,อุปกรณ์ -Keywords[tr]=depolama,ortam,usb,cdrom,device -Keywords[uk]=зберігання,носій,медіа,usb,cdrom,пристрій -Keywords[uz]=saqlash uskunasi,usb,cdrom,kompakt-disk -Keywords[uz@cyrillic]=сақлаш ускунаси,usb,cdrom,компакт-диск -Keywords[vi]=lưu trữ,ổ,usb,cdrom,thiết bị -Keywords[wa]=wårdaedje,media,usb,cdrom,device,éndjin -Keywords[zh_CN]=storage,media,usb,cdrom,device,存储,介质,设备 -Keywords[zh_TW]=storage,media,usb,cdrom,device,儲存,媒體,光碟機,裝置 - -Categories=Qt;TDE;X-TDE-settings-peripherals; diff --git a/kioslave/media/kcmodule/mimetypelistboxitem.cpp b/kioslave/media/kcmodule/mimetypelistboxitem.cpp deleted file mode 100644 index e7334248a..000000000 --- a/kioslave/media/kcmodule/mimetypelistboxitem.cpp +++ /dev/null @@ -1,35 +0,0 @@ -/* This file is part of the KDE Project - Copyright (c) 2005 Jean-Remy Falleri - Copyright (c) 2005 Kévin Ottens - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include "mimetypelistboxitem.h" - -#include - -MimetypeListBoxItem::MimetypeListBoxItem(const TQString &mimetype, TQListBox *parent) - : TQListBoxText(parent), m_mimetype(mimetype) -{ - KMimeType::Ptr mime = KMimeType::mimeType( mimetype ); - setText( mime->comment() ); -} - -const TQString &MimetypeListBoxItem::mimetype() const -{ - return m_mimetype; -} - diff --git a/kioslave/media/kcmodule/mimetypelistboxitem.h b/kioslave/media/kcmodule/mimetypelistboxitem.h deleted file mode 100644 index e02f58b11..000000000 --- a/kioslave/media/kcmodule/mimetypelistboxitem.h +++ /dev/null @@ -1,37 +0,0 @@ -/* This file is part of the KDE Project - Copyright (c) 2005 Jean-Remy Falleri - Copyright (c) 2005 K�vin Ottens - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef _MIMETYPELISTBOXITEM_H_ -#define _MIMETYPELISTBOXITEM_H_ - -#include -#include - -class MimetypeListBoxItem : public TQListBoxText -{ -public: - MimetypeListBoxItem(const TQString &mimetype, TQListBox *parent); - - const TQString &mimetype() const; - -private: - TQString m_mimetype; -}; - -#endif diff --git a/kioslave/media/kcmodule/notifiermodule.cpp b/kioslave/media/kcmodule/notifiermodule.cpp deleted file mode 100644 index 4146c514f..000000000 --- a/kioslave/media/kcmodule/notifiermodule.cpp +++ /dev/null @@ -1,230 +0,0 @@ -/* This file is part of the KDE Project - Copyright (c) 2005 Jean-Remy Falleri - Copyright (c) 2005 Kévin Ottens - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include "notifiermodule.h" - -#include - -#include -#include -#include -#include - -#include "notifiersettings.h" -#include "serviceconfigdialog.h" -#include "actionlistboxitem.h" -#include "mimetypelistboxitem.h" - -NotifierModule::NotifierModule(TQWidget *parent, const char *name) - : TDECModule(parent, name) -{ - TQBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); - - m_view = new NotifierModuleView( this ); - layout->addWidget( m_view ); - - m_view->addButton->setGuiItem( KStdGuiItem::add() ); - m_view->editButton->setGuiItem( KStdGuiItem::properties() ); - m_view->deleteButton->setGuiItem( KStdGuiItem::del() ); - - m_view->mimetypesCombo->insertItem( i18n("All Mime Types") ); - - TQStringList mimetypes = m_settings.supportedMimetypes(); - - TQStringList::iterator it = mimetypes.begin(); - TQStringList::iterator end = mimetypes.end(); - - for ( ; it!=end; ++it ) - { - new MimetypeListBoxItem( *it, m_view->mimetypesCombo->listBox() ); - } - - updateListBox(); - - connect( m_view->mimetypesCombo, TQT_SIGNAL( activated(int) ), - this, TQT_SLOT( slotMimeTypeChanged(int) ) ); - connect( m_view->actionsList, TQT_SIGNAL( selectionChanged(TQListBoxItem*) ), - this, TQT_SLOT( slotActionSelected(TQListBoxItem*) ) ); - connect( m_view->addButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotAdd() ) ); - connect( m_view->editButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotEdit() ) ); - connect( m_view->deleteButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotDelete() ) ); - connect( m_view->toggleAutoButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotToggleAuto() ) ); -} - -NotifierModule::~NotifierModule() -{ -} - -void NotifierModule::load() -{ - m_settings.reload(); - slotMimeTypeChanged( m_view->mimetypesCombo->currentItem() ); -} - -void NotifierModule::save() -{ - m_settings.save(); -} - -void NotifierModule::defaults() -{ - m_settings.clearAutoActions(); - slotMimeTypeChanged( m_view->mimetypesCombo->currentItem() ); -} - -void NotifierModule::updateListBox() -{ - m_view->actionsList->clear(); - slotActionSelected( 0L ); - - TQValueList services; - if ( m_mimetype.isEmpty() ) - { - services = m_settings.actions(); - } - else - { - services = m_settings.actionsForMimetype( m_mimetype ); - } - - TQValueList::iterator it; - - for ( it = services.begin(); it != services.end(); ++it ) - { - new ActionListBoxItem( *it, m_mimetype, m_view->actionsList ); - } -} - -void NotifierModule::slotActionSelected(TQListBoxItem *item) -{ - NotifierAction *action = 0L; - - if ( item!=0L ) - { - ActionListBoxItem *action_item - = static_cast(item); - action = action_item->action(); - } - - bool isWritable = action!=0L && action->isWritable(); - m_view->deleteButton->setEnabled( isWritable ); - m_view->editButton->setEnabled( isWritable ); - m_view->addButton->setEnabled( TRUE ); - m_view->toggleAutoButton->setEnabled( action!=0L && !m_mimetype.isEmpty() ); -} - -void NotifierModule::slotMimeTypeChanged(int index) -{ - if ( index == 0 ) - { - m_mimetype = TQString(); - } - else - { - TQListBoxItem *item = m_view->mimetypesCombo->listBox()->item( index ); - MimetypeListBoxItem *mime_item - = static_cast( item ); - m_mimetype = mime_item->mimetype(); - } - - updateListBox(); -} - -void NotifierModule::slotAdd() -{ - NotifierServiceAction *action = new NotifierServiceAction(); - ServiceConfigDialog dialog(action, m_settings.supportedMimetypes(), this); - - int value = dialog.exec(); - - if ( value == TQDialog::Accepted ) - { - m_settings.addAction( action ); - updateListBox(); - emit changed( true ); - } - else - { - delete action; - } -} - -void NotifierModule::slotEdit() -{ - ActionListBoxItem *action_item - = static_cast(m_view->actionsList->selectedItem()); - - NotifierServiceAction * action = dynamic_cast( action_item->action() ); - if ( action ) - { - ServiceConfigDialog dialog(action, m_settings.supportedMimetypes(), this); - - int value = dialog.exec(); - - if ( value == TQDialog::Accepted ) - { - updateListBox(); - emit changed( true ); - } - } -} - -void NotifierModule::slotDelete() -{ - ActionListBoxItem *action_item - = static_cast(m_view->actionsList->selectedItem()); - - NotifierServiceAction *action; - action = dynamic_cast( action_item->action() ); - if ( action ) - { - m_settings.deleteAction( action ); - updateListBox(); - emit changed( true ); - } -} - -void NotifierModule::slotToggleAuto() -{ - ActionListBoxItem *action_item - = static_cast( m_view->actionsList->selectedItem() ); - NotifierAction *action = action_item->action(); - - int index = m_view->actionsList->index( action_item ); - - if ( action->autoMimetypes().contains( m_mimetype ) ) - { - m_settings.resetAutoAction( m_mimetype ); - } - else - { - m_settings.setAutoAction( m_mimetype, action ); - } - - updateListBox(); - emit changed( true ); - - m_view->actionsList->setSelected( index, true ); -} - -#include "notifiermodule.moc" diff --git a/kioslave/media/kcmodule/notifiermodule.h b/kioslave/media/kcmodule/notifiermodule.h deleted file mode 100644 index 391feb47f..000000000 --- a/kioslave/media/kcmodule/notifiermodule.h +++ /dev/null @@ -1,58 +0,0 @@ -/* This file is part of the KDE Project - Copyright (c) 2005 Jean-Remy Falleri - Copyright (c) 2005 K�vin Ottens - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef _NOTIFIERMODULE_H_ -#define _NOTIFIERMODULE_H_ - -#include -#include - -#include "notifiersettings.h" -#include "notifiermoduleview.h" - -class NotifierModule : public TDECModule -{ - Q_OBJECT - -public: - NotifierModule( TQWidget* parent = 0, const char* name = 0); - ~NotifierModule(); - - void load(); - void save(); - void defaults(); - -private slots: - void slotAdd(); - void slotDelete(); - void slotEdit(); - void slotToggleAuto(); - - void slotActionSelected( TQListBoxItem * item ); - void slotMimeTypeChanged( int index ); - -private: - void updateListBox(); - - TQString m_mimetype; - NotifierSettings m_settings; - NotifierModuleView *m_view; -}; - -#endif diff --git a/kioslave/media/kcmodule/notifiermoduleview.ui b/kioslave/media/kcmodule/notifiermoduleview.ui deleted file mode 100644 index ad508c03d..000000000 --- a/kioslave/media/kcmodule/notifiermoduleview.ui +++ /dev/null @@ -1,171 +0,0 @@ - -NotifierModuleView - - - NotifierModuleView - - - - 0 - 0 - 600 - 480 - - - - - unnamed - - - - layout4 - - - - unnamed - - - - layout2 - - - - unnamed - - - - mediumType - - - - 5 - 5 - 0 - 0 - - - - Medium types: - - - - - mimetypesCombo - - - - 3 - 0 - 0 - 0 - - - - Here is the list of the available types of medium which can be monitored. You can filter the available actions by selecting a type of medium. If you want to see all the actions, select "All Mime Types". - - - - - - - layout3 - - - - unnamed - - - - layout1 - - - - unnamed - - - - addButton - - - &Add... - - - Click here to add an action. - - - - - deleteButton - - - &Delete - - - Click here to delete the selected action if possible. - - - - - editButton - - - &Edit... - - - Click here to edit the selected action if possible. - - - - - toggleAutoButton - - - &Toggle as Auto Action - - - Click here to perform this action automatically on detection of the selected medium type (this option is disabled when "All Mime Types" is selected). - - - - - - - buttonSpacer - - - Vertical - - - Expanding - - - - 70 - 101 - - - - - - actionsList - - - Here is the list of the available actions. You can modify them by using the buttons on your right. - - - - - - - - - - - kcombobox.h - kpushbutton.h - kpushbutton.h - kpushbutton.h - kpushbutton.h - klistbox.h - - diff --git a/kioslave/media/kcmodule/serviceconfigdialog.cpp b/kioslave/media/kcmodule/serviceconfigdialog.cpp deleted file mode 100644 index 61dd060f2..000000000 --- a/kioslave/media/kcmodule/serviceconfigdialog.cpp +++ /dev/null @@ -1,151 +0,0 @@ -/* This file is part of the KDE Project - Copyright (c) 2005 Jean-Remy Falleri - Copyright (c) 2005 Kévin Ottens - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include "serviceconfigdialog.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - - -#include "mimetypelistboxitem.h" - -ServiceConfigDialog::ServiceConfigDialog(NotifierServiceAction *action, - const TQStringList &mimetypesList, - TQWidget* parent, const char* name) - : KDialogBase(parent, name, true, i18n("Edit Service"), Ok|Cancel, Ok, true), - m_action(action) -{ - m_view = new ServiceView(this); - - m_view->iconButton->setIcon( m_action->iconName() ); - m_view->labelEdit->setText( m_action->label() ); - m_view->commandEdit->setText( m_action->service().m_strExec ); - - TQIconSet iconSet = SmallIconSet("configure"); - TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); - m_view->commandButton->setIconSet( iconSet ); - m_view->commandButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); - - m_iconChanged = false; - - TQStringList all_mimetypes = mimetypesList; - TQStringList action_mimetypes = action->mimetypes(); - - TQStringList::iterator it = all_mimetypes.begin(); - TQStringList::iterator end = all_mimetypes.end(); - - for ( ; it!=end; ++it ) - { - TQListBox *list; - - if ( action_mimetypes.contains( *it ) ) - { - list = m_view->mimetypesSelector->selectedListBox(); - } - else - { - list = m_view->mimetypesSelector->availableListBox(); - } - - new MimetypeListBoxItem( *it, list ); - } - - setMainWidget(m_view); - setCaption( m_action->label() ); - - connect( m_view->iconButton, TQT_SIGNAL( iconChanged(TQString) ), - this, TQT_SLOT( slotIconChanged() ) ); - connect( m_view->commandButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotCommand() ) ); -} - -bool operator==( KDEDesktopMimeType::Service s1, KDEDesktopMimeType::Service s2 ) -{ - return ( s1.m_strName==s2.m_strName ) - && ( s1.m_strIcon==s2.m_strIcon ) - && ( s1.m_strExec==s2.m_strExec ); -} - -bool operator!=( KDEDesktopMimeType::Service s1, KDEDesktopMimeType::Service s2 ) -{ - return !( s1==s2 ); -} - -void ServiceConfigDialog::slotOk() -{ - KDEDesktopMimeType::Service service; - service.m_strName = m_view->labelEdit->text(); - service.m_strIcon = m_view->iconButton->icon(); - service.m_strExec = m_view->commandEdit->text(); - - TQStringList mimetypes; - - uint list_count = m_view->mimetypesSelector->selectedListBox()->count(); - for( uint i=0; i < list_count; ++i ) - { - TQListBoxItem *item = m_view->mimetypesSelector->selectedListBox()->item(i); - MimetypeListBoxItem *mime_item = static_cast( item ); - mimetypes.append( mime_item->mimetype() ); - } - - if ( service!=m_action->service() || mimetypes!=m_action->mimetypes() ) - { - m_action->setService( service ); - m_action->setMimetypes( mimetypes ); - accept(); - } - else - { - reject(); - } -} - -void ServiceConfigDialog::slotIconChanged() -{ - m_iconChanged = true; -} - -void ServiceConfigDialog::slotCommand() -{ - KOpenWithDlg d(this); - int value = d.exec(); - if ( value == TQDialog::Accepted ) - { - KService::Ptr service = d.service(); - if ( service != 0L ) - { - m_view->commandEdit->setText( service->exec() ); - if ( m_iconChanged == false ) - { - m_view->iconButton->setIcon( service->icon() ); - } - } - } -} - -#include "serviceconfigdialog.moc" diff --git a/kioslave/media/kcmodule/serviceconfigdialog.h b/kioslave/media/kcmodule/serviceconfigdialog.h deleted file mode 100644 index 24e907205..000000000 --- a/kioslave/media/kcmodule/serviceconfigdialog.h +++ /dev/null @@ -1,48 +0,0 @@ -/* This file is part of the KDE Project - Copyright (c) 2005 Jean-Remy Falleri - Copyright (c) 2005 Kvin Ottens - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef _SERVICECONFIGDIALOG_H_ -#define _SERVICECONFIGDIALOG_H_ - -#include - -#include "notifierserviceaction.h" -#include "serviceview.h" - -class ServiceConfigDialog : public KDialogBase -{ - Q_OBJECT - -public: - ServiceConfigDialog(NotifierServiceAction *action, - const TQStringList &mimetypesList, - TQWidget* parent = 0, const char* name = 0); - -public slots: - void slotOk(); - void slotIconChanged(); - void slotCommand(); - -private: - ServiceView *m_view; - NotifierServiceAction *m_action; - bool m_iconChanged; -}; - -#endif diff --git a/kioslave/media/kcmodule/serviceview.ui b/kioslave/media/kcmodule/serviceview.ui deleted file mode 100644 index a6c3063f6..000000000 --- a/kioslave/media/kcmodule/serviceview.ui +++ /dev/null @@ -1,248 +0,0 @@ - -ServiceView - - - ServiceView - - - - 0 - 0 - 664 - 503 - - - - - 3 - 3 - 0 - 0 - - - - - 640 - 480 - - - - Edit Service - - - - unnamed - - - - groupBox1 - - - - 7 - 7 - 0 - 0 - - - - Edit Service - - - - unnamed - - - - layout8 - - - - unnamed - - - - layout6 - - - - unnamed - - - - iconButton - - - - 0 - 0 - 0 - 0 - - - - - 40 - 40 - - - - - 40 - 40 - - - - - - - 32 - - - - - layout5 - - - - unnamed - - - - spacer4 - - - Vertical - - - Minimum - - - - 20 - 20 - - - - - - labelEdit - - - - 7 - 0 - 0 - 0 - - - - - - spacer5 - - - Vertical - - - Minimum - - - - 20 - 21 - - - - - - - - - - line1 - - - HLine - - - Sunken - - - Horizontal - - - - - mimetypesSelector - - - - 5 - 5 - 0 - 0 - - - - Available &medium types: - - - Displa&y service for: - - - false - - - - - layout7 - - - - unnamed - - - - m_lbCommmand - - - - 1 - 1 - 0 - 0 - - - - Command: - - - - - commandEdit - - - - - commandButton - - - - - - - - - - - - - kicondialog.h - klineedit.h - kactionselector.h - kactivelabel.h - klineedit.h - kpushbutton.h - - diff --git a/kioslave/media/tdecmodule/CMakeLists.txt b/kioslave/media/tdecmodule/CMakeLists.txt new file mode 100644 index 000000000..4a1dc2345 --- /dev/null +++ b/kioslave/media/tdecmodule/CMakeLists.txt @@ -0,0 +1,45 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR}/kioslave/media/libmediacommon + ${CMAKE_SOURCE_DIR}/kioslave/media/libmediacommon + ${CMAKE_BINARY_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} +) + + +##### other data ################################ + +install( FILES media.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) + + +##### kcm_media (module) ######################## + +set( target kcm_media ) + +set( ${target}_SRCS + notifiermodule.cpp notifiermoduleview.ui serviceconfigdialog.cpp + serviceview.ui mimetypelistboxitem.cpp managermodule.cpp + managermoduleview.ui main.cpp +) + +tde_add_kpart( ${target} AUTOMOC + SOURCES ${${target}_SRCS} + LINK mediacommon-static kio-shared + DESTINATION ${PLUGIN_INSTALL_DIR} +) diff --git a/kioslave/media/tdecmodule/Makefile.am b/kioslave/media/tdecmodule/Makefile.am new file mode 100644 index 000000000..72f9f385c --- /dev/null +++ b/kioslave/media/tdecmodule/Makefile.am @@ -0,0 +1,21 @@ +INCLUDES = -I$(srcdir)/../libmediacommon -I../libmediacommon $(all_includes) +METASOURCES = AUTO + +kde_module_LTLIBRARIES = kcm_media.la +kcm_media_la_SOURCES = notifiermodule.cpp notifiermoduleview.ui \ + serviceconfigdialog.cpp serviceview.ui \ + mimetypelistboxitem.cpp \ + managermodule.cpp managermoduleview.ui \ + main.cpp + +kcm_media_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +kcm_media_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) + +noinst_HEADERS = notifiermodule.h managermodule.h \ + serviceconfigdialog.h mimetypelistboxitem.h \ + main.h + +xdg_apps_DATA = media.desktop + +messages: rc.cpp + $(XGETTEXT) *.cpp -o $(podir)/kcmmedia.pot diff --git a/kioslave/media/tdecmodule/main.cpp b/kioslave/media/tdecmodule/main.cpp new file mode 100644 index 000000000..9036583df --- /dev/null +++ b/kioslave/media/tdecmodule/main.cpp @@ -0,0 +1,104 @@ +/* This file is part of the KDE Project + Copyright (c) 2005 Jean-Remy Falleri + Copyright (c) 2005 Kévin Ottens + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License version 2 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include "main.h" + +#include +#include + +#include +#include +#include + +#include + +#include "notifiermodule.h" +#include "managermodule.h" + + +typedef KGenericFactory MediaFactory; +K_EXPORT_COMPONENT_FACTORY( kcm_media, MediaFactory( "kcmmedia" ) ) + + +MediaModule::MediaModule( TQWidget *parent, const char *name, const TQStringList& ) + : TDECModule(MediaFactory::instance(), parent, name ) +{ + TDEGlobal::locale()->insertCatalogue("kio_media"); + TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); + TQTabWidget *tab = new TQTabWidget( this ); + + layout->addWidget( tab ); + + + + m_notifierModule = new NotifierModule( this, "notifier" ); + tab->addTab( m_notifierModule, i18n( "&Notifications" ) ); + connect( m_notifierModule, TQT_SIGNAL( changed( bool ) ), + this, TQT_SLOT( moduleChanged( bool ) ) ); + + m_managerModule = new ManagerModule( this, "manager" ); + tab->addTab( m_managerModule, i18n( "&Advanced" ) ); + connect( m_managerModule, TQT_SIGNAL( changed( bool ) ), + this, TQT_SLOT( moduleChanged( bool ) ) ); + + + + TDEAboutData * about = new TDEAboutData("kcmmedia", + I18N_NOOP("Storage Media"), + "0.6", + I18N_NOOP("Storage Media Control Panel Module"), + TDEAboutData::License_GPL_V2, + I18N_NOOP("(c) 2005 Jean-Remy Falleri")); + about->addAuthor("Jean-Remy Falleri", I18N_NOOP("Maintainer"), "jr.falleri@laposte.net"); + about->addAuthor("Kevin Ottens", 0, "ervin ipsquad net"); + about->addAuthor("Valentine Sinitsyn", 0, "e_val@inbox.ru"); + about->addCredit("Achim Bohnet", I18N_NOOP("Help for the application design")); + + setAboutData( about ); +} + +void MediaModule::load() +{ + m_notifierModule->load(); + m_managerModule->load(); +} + +void MediaModule::save() +{ + m_notifierModule->save(); + m_managerModule->save(); +} + +void MediaModule::defaults() +{ + m_notifierModule->defaults(); + m_managerModule->defaults(); +} + +void MediaModule::moduleChanged( bool state ) +{ + emit changed( state ); +} + +TQString MediaModule::quickHelp() const +{ + return i18n("FIXME : Write me..."); +} + +#include "main.moc" diff --git a/kioslave/media/tdecmodule/main.h b/kioslave/media/tdecmodule/main.h new file mode 100644 index 000000000..5052d58eb --- /dev/null +++ b/kioslave/media/tdecmodule/main.h @@ -0,0 +1,45 @@ +/* This file is part of the KDE Project + Copyright (c) 2005 Jean-Remy Falleri + Copyright (c) 2005 Kvin Ottens + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License version 2 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef _MAIN_H_ +#define _MAIN_H_ + +#include + +class MediaModule : public TDECModule +{ + Q_OBJECT + +public: + MediaModule( TQWidget *parent, const char *name, const TQStringList& ); + + virtual void load(); + virtual void save(); + virtual void defaults(); + virtual TQString quickHelp() const; + +protected slots: + void moduleChanged( bool state ); + +private: + TDECModule *m_notifierModule; + TDECModule *m_managerModule; +}; + +#endif diff --git a/kioslave/media/tdecmodule/managermodule.cpp b/kioslave/media/tdecmodule/managermodule.cpp new file mode 100644 index 000000000..4c9859889 --- /dev/null +++ b/kioslave/media/tdecmodule/managermodule.cpp @@ -0,0 +1,213 @@ +/* This file is part of the KDE Project + Copyright (c) 2005 Kvin Ottens + Copyright (c) 2006 Valentine Sinitsyn + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License version 2 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include + +#include "managermodule.h" + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "managermoduleview.h" +#include "mediamanagersettings.h" + +ManagerModule::ManagerModule( TQWidget* parent, const char* name ) + : TDECModule( parent, name ) +{ + view = new ManagerModuleView( this ); + + addConfig( MediaManagerSettings::self(), view ); + +#ifndef COMPILE_HALBACKEND + TQString hal_text = view->kcfg_HalBackendEnabled->text(); + hal_text += " ("+i18n("No support for HAL on this system")+")"; + view->kcfg_HalBackendEnabled->setText( hal_text ); +#endif + view->kcfg_HalBackendEnabled->setEnabled( false ); + +#ifndef COMPILE_LINUXCDPOLLING + TQString poll_text = view->kcfg_CdPollingEnabled->text(); + poll_text += " ("+i18n("No support for CD polling on this system")+")"; + view->kcfg_CdPollingEnabled->setText( poll_text ); +#endif + view->kcfg_CdPollingEnabled->setEnabled( false ); + + connect( view->option_automount, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) ); + connect( view->option_ro, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) ); + connect( view->option_quiet, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) ); + connect( view->option_flush, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) ); + connect( view->option_uid, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) ); + connect( view->option_utf8, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) ); + connect( view->option_sync, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) ); + connect( view->option_atime, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) ); + connect( view->option_shortname, SIGNAL( activated(int) ), this, SLOT( emitChanged() ) ); + connect( view->option_journaling, SIGNAL( activated(int) ), this, SLOT( emitChanged() ) ); + + load(); +} + + +void ManagerModule::load() +{ + TDECModule::load(); + + TDEConfig config("mediamanagerrc"); + config.setGroup("DefaultOptions"); + + view->option_automount->setChecked( config.readBoolEntry("automount", false) ); + view->option_ro->setChecked( config.readBoolEntry("ro", false) ); + view->option_quiet->setChecked( config.readBoolEntry("quiet", false) ); + if (config.hasKey("flush")) + view->option_flush->setChecked( config.readBoolEntry("flush") ); + else + view->option_flush->setNoChange(); + view->option_uid->setChecked( config.readBoolEntry("uid", true) ); + view->option_utf8->setChecked( config.readBoolEntry("utf8", true) ); + if (config.hasKey("sync")) + view->option_sync->setChecked( config.readBoolEntry("sync") ); + else + view->option_sync->setNoChange(); + if (config.hasKey("atime")) + view->option_atime->setChecked( config.readBoolEntry("atime") ); + else + view->option_atime->setNoChange(); + + QString value; + + value = config.readEntry("shortname", "lower").lower(); + for (int i = 0; i < view->option_shortname->count(); i++) + if (view->option_shortname->text(i).lower() == value) view->option_shortname->setCurrentItem(i); + + value = config.readEntry("journaling", "ordered").lower(); + for (int i = 0; i < view->option_journaling->count(); i++) + if (view->option_journaling->text(i).lower() == value) view->option_journaling->setCurrentItem(i); + + rememberSettings(); +} + +void ManagerModule::save() +{ + TDECModule::save(); + + TDEConfig config("mediamanagerrc"); + config.setGroup("DefaultOptions"); + + config.writeEntry("automount", view->option_automount->isChecked()); + config.writeEntry("ro", view->option_ro->isChecked()); + config.writeEntry("quiet", view->option_quiet->isChecked()); + if (view->option_flush->state() == TQButton::NoChange) + config.deleteEntry("flush"); + else + config.writeEntry("flush", view->option_flush->isChecked()); + config.writeEntry("uid", view->option_uid->isChecked()); + config.writeEntry("utf8", view->option_utf8->isChecked()); + if (view->option_sync->state() == TQButton::NoChange) + config.deleteEntry("sync"); + else + config.writeEntry("sync", view->option_sync->isChecked()); + if (view->option_atime->state() == TQButton::NoChange) + config.deleteEntry("atime"); + else + config.writeEntry("atime", view->option_atime->isChecked()); + config.writeEntry("journaling", view->option_journaling->currentText().lower()); + config.writeEntry("shortname", view->option_shortname->currentText().lower()); + + rememberSettings(); + + //Well... reloadBackends is buggy with HAL, it seems to be linked + //to a bug in the unmaintained Qt3 DBUS binding ;-/ + //DCOPRef mediamanager( "kded", "mediamanager" ); + //DCOPReply reply = mediamanager.call( "reloadBackends" ); + + // So we use this hack instead... + DCOPRef kded( "kded", "kded" ); + kded.call( "unloadModule", "mediamanager" ); + kded.call( "loadModule", "mediamanager" ); + + KDirNotify_stub notifier( "*", "*" ); + notifier.FilesAdded( "media:/" ); +} + +void ManagerModule::defaults() +{ + TDECModule::defaults(); + + view->option_automount->setChecked(false); + view->option_ro->setChecked(false); + view->option_quiet->setChecked(false); + view->option_flush->setNoChange(); + view->option_uid->setChecked(true); + view->option_utf8->setChecked(true); + view->option_sync->setNoChange(); + view->option_atime->setNoChange(); + view->option_journaling->setCurrentItem(1); + view->option_shortname->setCurrentItem(0); +} + +void ManagerModule::rememberSettings() +{ + TQObjectList *options = view->queryList(0, "^option_"); + TQObject *current = 0; + TQObjectListIterator it(*options); + + settings.clear(); + while ( (current = it.current()) != 0 ) { + if (current->isA("TQCheckBox")) + settings[current] = ((TQCheckBox *)current)->state(); + else if (current->isA("TQComboBox")) + settings[current] = ((TQComboBox *)current)->currentItem(); + ++it; + } + delete options; + +} + +void ManagerModule::emitChanged() +{ + TQObjectList *options = view->queryList(0, "^option_"); + TQObject *current = 0; + TQObjectListIterator it(*options); + int value = -1; + bool somethingChanged = false; + + while ( (current = it.current()) != 0 ) { + if (current->isA("TQCheckBox")) + value = ((TQCheckBox *)current)->state(); + else if (current->isA("TQComboBox")) + value = ((TQComboBox *)current)->currentItem(); + + if (settings[current] != value) { + somethingChanged = true; + break; + } + + ++it; + } + delete options; + + emit changed(somethingChanged); +} + +#include "managermodule.moc" diff --git a/kioslave/media/tdecmodule/managermodule.h b/kioslave/media/tdecmodule/managermodule.h new file mode 100644 index 000000000..a0a384675 --- /dev/null +++ b/kioslave/media/tdecmodule/managermodule.h @@ -0,0 +1,49 @@ +/* This file is part of the KDE Project + Copyright (c) 2005 Kvin Ottens + Copyright (c) 2006 Valentine Sinitsyn + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License version 2 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef _MANAGERMODULE_H_ +#define _MANAGERMODULE_H_ + +#include +#include + +class ManagerModuleView; + +class ManagerModule : public TDECModule +{ + Q_OBJECT + +public: + ManagerModule( TQWidget* parent = 0, const char* name = 0); + + void load(); + void save(); + void defaults(); + +private: + void rememberSettings(); + + ManagerModuleView *view; + TQMap settings; + +private slots: + void emitChanged(); +}; + +#endif diff --git a/kioslave/media/tdecmodule/managermoduleview.ui b/kioslave/media/tdecmodule/managermoduleview.ui new file mode 100644 index 000000000..afde70c75 --- /dev/null +++ b/kioslave/media/tdecmodule/managermoduleview.ui @@ -0,0 +1,343 @@ + +ManagerModuleView + + + ManagerModuleView + + + + 0 + 0 + 600 + 480 + + + + ManagerModuleView + + + + unnamed + + + + kcfg_HalBackendEnabled + + + Enable HAL backend + + + Select this if you want to enable the Hardware Abstraction Layer (http://hal.freedesktop.org/wiki/Software/hal) support. + + + + + kcfg_CdPollingEnabled + + + Enable CD polling + + + Select this to enable the CD polling. + + + + + kcfg_AutostartEnabled + + + Enable medium application autostart after mount + + + Select this if you want to enable application autostart after mounting a device. + + + + + groupbox_mount + + + Mount options + + + + unnamed + + + + textLabel3 + + + Here you can specify default mount options for your storage media. Please note that some options are not supported for certain filesystems and/or medium. You will be able to redefine all these options on per-volume basis later, using Properties dialog of the corresponding volume.<br> +Some of the options are tristate. Leave them "undefined" to let KDE choose the best value depending on your media. + + + WordBreak|AlignVCenter + + + + + layout30 + + + + unnamed + + + + option_ro + + + Read only + + + By default, mount all file systems read-only. + + + + + option_uid + + + Mount as user + + + Mount this file system as user. + + + + + option_flush + + + Flushed IO + + + true + + + Always flush all data to the hot plug devices immediately and don't cache it. + + + + + option_sync + + + Synchronous + + + true + + + All I/O to the file system should be done synchronously. + + + + + option_quiet + + + Quiet + + + Attempts to chown or chmod files do not return errors, although they fail. Use with caution! + + + + + option_utf8 + + + UTF-8 charset + + + UTF8 is the filesystem safe 8-bit encoding of Unicode that is used by the console. It can be be enabled for the filesystem with this option. + + + + + layout29 + + + + unnamed + + + + text_shortname + + + Short names: + + + option_shortname + + + <h2>Defines the behaviour for creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.</h2> + +<h3><b>Lower</b></h3> +Force the short name to lower case upon display; store a long name when the short name is not all upper case. + +<h3><b>Windows 95</b></h3> +Force the short name to upper case upon display; store a long name when the short name is not all upper case. + +<h3><b>Windows NT</b></h3> +Display the shortname as is; store a long name when the short name is not all lower case or all upper case. + +<h3><b>Mixed</b></h3> +Display the short name as is; store a long name when the short name is not all upper case. + + + + + + All Data + + + + + Ordered + + + + + Writeback + + + + option_journaling + + + 1 + + + + + text_journaling + + + Journaling: + + + option_journaling + + + <h2>Specifies the journalling mode for file data. Metadata is always journaled. </h2> + +<h3><b>All Data</b></h3> + All data is committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security. + +<h3><b>Ordered</b></h3> + All data is forced directly out to the main file system prior to its metadata being committed to the journal. + +<h3><b>Write Back</b></h3> + Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal. This is rumoured to be the highest-throughput option. It guarantees internal file system integrity, however it can allow old data to appear in files after a crash and journal recovery. + + + + + + Lower + + + + + Windows 95 + + + + + Windows NT + + + + + Mixed + + + + option_shortname + + + + + + + option_automount + + + Mount automatically + + + By default, mount all file systems automatically. + + + + + option_atime + + + Access time updates + + + true + + + Update inode access time for each access. + + + + + + + + + spacer1 + + + Vertical + + + Expanding + + + + 21 + 130 + + + + + + + + kcfg_HalBackendEnabled + toggled(bool) + groupbox_mount + setEnabled(bool) + + + + kcfg_HalBackendEnabled + kcfg_CdPollingEnabled + kcfg_AutostartEnabled + option_automount + option_ro + option_quiet + option_sync + option_atime + option_flush + option_utf8 + option_uid + option_journaling + option_shortname + + + managermoduleview.ui.h + + + init() + + + diff --git a/kioslave/media/tdecmodule/media.desktop b/kioslave/media/tdecmodule/media.desktop new file mode 100644 index 000000000..4afd68cb5 --- /dev/null +++ b/kioslave/media/tdecmodule/media.desktop @@ -0,0 +1,197 @@ +[Desktop Entry] +Type=Application +#DocPath= +Icon=system +Exec=kcmshell media + + +X-TDE-Library=media +X-TDE-FactoryName=media +X-TDE-ParentApp=kcontrol + +Name=Storage Media +Name[af]=Stoor Media +Name[ar]=وسائط التخزين +Name[be]=Носьбіты +Name[bg]=Съхраняващи устройства +Name[bn]=স্টোরেজ মিডিয়া +Name[bs]=Uređaji za smještaj podataka +Name[ca]=Suports d'emmagatzematge +Name[cs]=Úložná zařízení +Name[csb]=Zôpisowné media +Name[da]=Opbevaringsmedie +Name[de]=Speichermedien +Name[el]=Συσκευές αποθήκευσης +Name[eo]=Enmemoriga Medio +Name[es]=Dispositivos de almacenamiento +Name[et]=Andmekandjad +Name[eu]=Biltegiratze-euskarria +Name[fa]=رسانۀ ذخیره‌گاه +Name[fi]=Tallennusmedia +Name[fr]=Support de stockage +Name[fy]=Opslachapparaten +Name[ga]=Meán Stórais +Name[gl]=Medios de armacenaxe +Name[he]=התקנים +Name[hi]=भंडार मीडिया +Name[hr]=Mediji za pohranjivanje +Name[hu]=Tárolóeszközök +Name[is]=Geymslumiðlar +Name[it]=Dispositivi di archiviazione +Name[ja]=記憶メディア +Name[ka]=მონაცემთა შენახვის მოწყობილობები +Name[kk]=Жинақтаушы құрылғылар +Name[km]=ឧបករណ៍​ផ្ទុក +Name[lt]=Saugojimo įrenginiai +Name[lv]=Datu nesējs +Name[mk]=Медиуми за податоци +Name[ms]=Media Storan +Name[nb]=Lagringsenheter +Name[nds]=Spiekermedien +Name[ne]=भण्डारण मिडिया +Name[nl]=Opslagapparaten +Name[nn]=Lagringsmedium +Name[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ +Name[pl]=Urządzenia przechowywania danych +Name[pt]=Dispositivos de Armazenamento +Name[pt_BR]=Mídia de Armazenamento +Name[ro]=Mediu de stocare +Name[ru]=Устройства хранения данных +Name[rw]=Uburyo bwo Kubika +Name[se]=Vurkenmedia +Name[sk]=Zálohovacie médiá +Name[sl]=Nosilci za shranjevanje +Name[sr]=Складишни медијуми +Name[sr@Latn]=Skladišni medijumi +Name[sv]=Lagringsmedia +Name[ta]=சேகரிப்பு ஊடகம் +Name[tg]=Захирагоҳи маълумот +Name[th]=สื่อเก็บข้อมูล +Name[tr]=Depolama Ortamı +Name[tt]=Saqlawlı Media +Name[uk]=Пристрої зберігання інформації +Name[uz]=Saqlash uskunalari +Name[uz@cyrillic]=Сақлаш ускуналари +Name[vi]=Ổ chứa Dữ liệu +Name[wa]=Sopoirts di wårdaedje +Name[zh_CN]=存储介质 +Name[zh_TW]=儲存媒體 + +Comment=Configure Storage Media +Comment[af]=Stel Stoor Media op +Comment[ar]=إعداد وسائط التخزين +Comment[be]=Настаўленні носьбітаў +Comment[bg]=Настройване на устройствата за съхранение на информация +Comment[bn]=স্টোরেজ মিডিয়া কনফিগার করুন +Comment[bs]=Podesite prikaz uređaja +Comment[ca]=Configura els suports d'emmagatzematge +Comment[cs]=Nastavení úložných médií +Comment[csb]=Kònfigùracëjô zôpisownëch mediów +Comment[da]=Opsætning af opbevarelsesmedie +Comment[de]=Speichermedien einrichten +Comment[el]=Ρύθμιση μέσων αποθήκευσης +Comment[eo]=Agordo de enmemoriga medio +Comment[es]=Configuración de las medios de almacenamiento +Comment[et]=Salvestusandmekandjate seadistused +Comment[eu]=Konfiguratu biltegiratze-euskarria +Comment[fa]=پیکربندی رسانۀ ذخیره‌گاه +Comment[fi]=Aseta tallennusmedia +Comment[fr]=Configurer le média de stockage +Comment[fy]=Opslachmedia ynstelle +Comment[ga]=Cumraigh Meáin Stórála +Comment[gl]=Configurar Medios de Armacenaxe +Comment[he]=שינוי הגדרות מדיות אחסון +Comment[hr]=Konfiguriranje medija za pohranu +Comment[hu]=A tárolóeszközök beállítása +Comment[is]=Stillingar geymslumiðla +Comment[it]=Configura dispositivi di archiviazione +Comment[ja]=記憶メディアの設定 +Comment[ka]=შენახვის მედიის გამართვა +Comment[kk]=Жинақтаушыларды баптау +Comment[km]=កំណត់​រចនាសម្ព័ន្ធ​ឧបករណ៍​ផ្ទុក +Comment[lt]=Konfigūruoti saugojimo įrenginius +Comment[mk]=Конфигурирајте ги медиумите за податоци +Comment[nb]=Sett opp lagringsmedier +Comment[nds]=Spiekermedien instellen +Comment[ne]=भण्डारण मिडिया कन्फिगर गर्नुहोस् +Comment[nl]=Opslagmedia instellen +Comment[nn]=Set opp lagringsmedium +Comment[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ ਸੰਰਚਨਾ +Comment[pl]=Konfiguracja nośników danych +Comment[pt]=Configurar os Suportes de Armazenamento +Comment[pt_BR]=Configura as mídias de armazenamento +Comment[ro]=Configurează mediile de stocare +Comment[ru]=Настройка подключаемых устройств хранения +Comment[se]=Heivet vurkenmediaid +Comment[sk]=Nastavenie zálohovacích médií +Comment[sl]=Nastavitve nosilcev za shranjevanje +Comment[sr]=Подешавање медијума за складиштење +Comment[sr@Latn]=Podešavanje medijuma za skladištenje +Comment[sv]=Anpassa lagringsmedia +Comment[th]=ตั้งค่าสื่อบันทึก +Comment[tr]=Depolama Aygıtlarını Yapılandır +Comment[tt]=Saqlaw Cıhazların Caylaw +Comment[uk]=Налаштування пристроїв зберігання інформації +Comment[uz]=Saqlash uskunalarni moslash +Comment[uz@cyrillic]=Сақлаш ускуналарни мослаш +Comment[vi]=Cấu hình Ổ lưu trữ Dữ liệu +Comment[wa]=Apontiaedjes sopoirts di wårdaedje +Comment[zh_CN]=配置存储介质 +Comment[zh_TW]=設定儲存媒體 + +Keywords=storage,media,usb,cdrom,device +Keywords[ar]=تخزين,وسائط,usb,قرص مدمج cdrom,جهاز +Keywords[be]=Носьбіт,Прылада,storage,media,usb,cdrom,device +Keywords[bg]=съхранение, информация, компактдиск, устройство, данни, storage, media, usb, cdrom, device +Keywords[bs]=storage,media,usb,cdrom,device,uređaji,mediji +Keywords[ca]=emmagatzematge,suport,usb,cdrom,dispositiu +Keywords[cs]=úložiště,média,USB,CDROM,zařízení +Keywords[csb]=pòdôwczi,trzëmanié pòdôwków,zôpisowné media,usb,cdrom,ùrządzenié,nëk +Keywords[da]=opbevaring,medie,usb,cdrom,enhed +Keywords[de]=Speicher,Medien,Medium,USB,CD-Rom,cdrom,Gerät +Keywords[el]=αποθήκευση,μέσο,usb,cdrom,συσκευή +Keywords[eo]=memorigilo,medio,usb,lumdisko,aparato +Keywords[es]=almacenamiento,medios,usb,cdrom,dispositivo +Keywords[et]=salvestamine,andmekandja,usb,cd,seade +Keywords[eu]=biltegiratzea,euskarriak,usb,cdrom,gailua +Keywords[fa]=ذخیره‌گاه، رسانه، گذرگاه سریال جهانی، دیسک فشرده، دستگاه +Keywords[fi]=varasto,media,usb,cdrom,laite +Keywords[fr]=stockage,media,média,medium,usb,cdrom,périphérique +Keywords[fy]=storage,opslach,media,usb,cd-rom,kompakt-skiif,device,apparaat,mp3-speler,usb-stick,geheugenkaart +Keywords[ga]=stóráil,stóras,meáin,meán,usb,cdrom,dlúthdhiosca,gléas +Keywords[gl]=armacenaxe,medios,usb,cdrom,dispositivo +Keywords[he]=storage,media,usb,cdrom,device,מדיה,התקן,סידירום,תקליטור +Keywords[hr]=storage,media,usb,cdrom,device,pohrana,snimanje,mediji,uređaj +Keywords[hu]=tároló,adathordozó,USB,CD-ROM,eszköz +Keywords[is]=geymsla,miðill,usb,cdrom,tæki +Keywords[it]=storage,media,usb,cdrom,dispositivi,dvd,penna usb,memory stick,stick +Keywords[ja]=記憶,メディア,usb,cdrom,デバイス +Keywords[km]=ឧបករណ៍​ផ្ទុក, usb,ស៊ីឌីរ៉ូម,ឧបករណ៍ +Keywords[lt]=storage,media,usb,cdrom,device,saugojimas,media,įrenginiai,usb +Keywords[mk]=storage,media,usb,cdrom,device,медиуми,усб,цдром,уред +Keywords[nb]=lagring,media,usb,CD-spiller,CD-ROM,enheter,minnepinner,harddisker,HD,eksterne harddisker,zip-disker +Keywords[nds]=Spieker,Medien,USB,CDROM,Reedschap +Keywords[ne]=भण्डारण, मिडिया,usb,cdrom, यन्त्र +Keywords[nl]=storage,opslag,media,usb,cd-rom,device,apparaat,mp3-speler,usb-stick,geheugenkaart +Keywords[nn]=lagring,media,usb,CD-spiller,CD-ROM,einingar,minnepinnar,harddiskar,HD,eksterne harddiskar,zip-diskar +Keywords[pa]=ਸਟੋਰੇਜ਼,ਮੀਡਿਆ,ਜੰਤਰ,usb,cdrom +Keywords[pl]=dane,przechowywanie danych,nośnik danych,nośniki danych,usb,cdrom,urządzenie +Keywords[pt]=armazenamento,discos,usb,cdrom,dispositivo +Keywords[pt_BR]=armazenamento,mídia,usb,cd-rom,device,dispositivo +Keywords[ro]=stocare,mediu,usb,cdrom,dispozitiv +Keywords[ru]=storage,media,usb,cdrom,device,устройство хранения +Keywords[sl]=shranjevanje,nosilec,usb,cdrom,naprava +Keywords[sr]=storage,media,usb,cdrom,device,складиштење,медијум,уређај +Keywords[sr@Latn]=storage,media,usb,cdrom,device,skladištenje,medijum,uređaj +Keywords[sv]=lagring,media,usb,cdrom,enhet +Keywords[th]=ที่เก็บข้อมูล,สื่อ,ยูเอสบี,,ซีดีรอม,อุปกรณ์ +Keywords[tr]=depolama,ortam,usb,cdrom,device +Keywords[uk]=зберігання,носій,медіа,usb,cdrom,пристрій +Keywords[uz]=saqlash uskunasi,usb,cdrom,kompakt-disk +Keywords[uz@cyrillic]=сақлаш ускунаси,usb,cdrom,компакт-диск +Keywords[vi]=lưu trữ,ổ,usb,cdrom,thiết bị +Keywords[wa]=wårdaedje,media,usb,cdrom,device,éndjin +Keywords[zh_CN]=storage,media,usb,cdrom,device,存储,介质,设备 +Keywords[zh_TW]=storage,media,usb,cdrom,device,儲存,媒體,光碟機,裝置 + +Categories=Qt;TDE;X-TDE-settings-peripherals; diff --git a/kioslave/media/tdecmodule/mimetypelistboxitem.cpp b/kioslave/media/tdecmodule/mimetypelistboxitem.cpp new file mode 100644 index 000000000..e7334248a --- /dev/null +++ b/kioslave/media/tdecmodule/mimetypelistboxitem.cpp @@ -0,0 +1,35 @@ +/* This file is part of the KDE Project + Copyright (c) 2005 Jean-Remy Falleri + Copyright (c) 2005 Kévin Ottens + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License version 2 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include "mimetypelistboxitem.h" + +#include + +MimetypeListBoxItem::MimetypeListBoxItem(const TQString &mimetype, TQListBox *parent) + : TQListBoxText(parent), m_mimetype(mimetype) +{ + KMimeType::Ptr mime = KMimeType::mimeType( mimetype ); + setText( mime->comment() ); +} + +const TQString &MimetypeListBoxItem::mimetype() const +{ + return m_mimetype; +} + diff --git a/kioslave/media/tdecmodule/mimetypelistboxitem.h b/kioslave/media/tdecmodule/mimetypelistboxitem.h new file mode 100644 index 000000000..e02f58b11 --- /dev/null +++ b/kioslave/media/tdecmodule/mimetypelistboxitem.h @@ -0,0 +1,37 @@ +/* This file is part of the KDE Project + Copyright (c) 2005 Jean-Remy Falleri + Copyright (c) 2005 K�vin Ottens + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License version 2 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef _MIMETYPELISTBOXITEM_H_ +#define _MIMETYPELISTBOXITEM_H_ + +#include +#include + +class MimetypeListBoxItem : public TQListBoxText +{ +public: + MimetypeListBoxItem(const TQString &mimetype, TQListBox *parent); + + const TQString &mimetype() const; + +private: + TQString m_mimetype; +}; + +#endif diff --git a/kioslave/media/tdecmodule/notifiermodule.cpp b/kioslave/media/tdecmodule/notifiermodule.cpp new file mode 100644 index 000000000..4146c514f --- /dev/null +++ b/kioslave/media/tdecmodule/notifiermodule.cpp @@ -0,0 +1,230 @@ +/* This file is part of the KDE Project + Copyright (c) 2005 Jean-Remy Falleri + Copyright (c) 2005 Kévin Ottens + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License version 2 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include "notifiermodule.h" + +#include + +#include +#include +#include +#include + +#include "notifiersettings.h" +#include "serviceconfigdialog.h" +#include "actionlistboxitem.h" +#include "mimetypelistboxitem.h" + +NotifierModule::NotifierModule(TQWidget *parent, const char *name) + : TDECModule(parent, name) +{ + TQBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); + + m_view = new NotifierModuleView( this ); + layout->addWidget( m_view ); + + m_view->addButton->setGuiItem( KStdGuiItem::add() ); + m_view->editButton->setGuiItem( KStdGuiItem::properties() ); + m_view->deleteButton->setGuiItem( KStdGuiItem::del() ); + + m_view->mimetypesCombo->insertItem( i18n("All Mime Types") ); + + TQStringList mimetypes = m_settings.supportedMimetypes(); + + TQStringList::iterator it = mimetypes.begin(); + TQStringList::iterator end = mimetypes.end(); + + for ( ; it!=end; ++it ) + { + new MimetypeListBoxItem( *it, m_view->mimetypesCombo->listBox() ); + } + + updateListBox(); + + connect( m_view->mimetypesCombo, TQT_SIGNAL( activated(int) ), + this, TQT_SLOT( slotMimeTypeChanged(int) ) ); + connect( m_view->actionsList, TQT_SIGNAL( selectionChanged(TQListBoxItem*) ), + this, TQT_SLOT( slotActionSelected(TQListBoxItem*) ) ); + connect( m_view->addButton, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( slotAdd() ) ); + connect( m_view->editButton, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( slotEdit() ) ); + connect( m_view->deleteButton, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( slotDelete() ) ); + connect( m_view->toggleAutoButton, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( slotToggleAuto() ) ); +} + +NotifierModule::~NotifierModule() +{ +} + +void NotifierModule::load() +{ + m_settings.reload(); + slotMimeTypeChanged( m_view->mimetypesCombo->currentItem() ); +} + +void NotifierModule::save() +{ + m_settings.save(); +} + +void NotifierModule::defaults() +{ + m_settings.clearAutoActions(); + slotMimeTypeChanged( m_view->mimetypesCombo->currentItem() ); +} + +void NotifierModule::updateListBox() +{ + m_view->actionsList->clear(); + slotActionSelected( 0L ); + + TQValueList services; + if ( m_mimetype.isEmpty() ) + { + services = m_settings.actions(); + } + else + { + services = m_settings.actionsForMimetype( m_mimetype ); + } + + TQValueList::iterator it; + + for ( it = services.begin(); it != services.end(); ++it ) + { + new ActionListBoxItem( *it, m_mimetype, m_view->actionsList ); + } +} + +void NotifierModule::slotActionSelected(TQListBoxItem *item) +{ + NotifierAction *action = 0L; + + if ( item!=0L ) + { + ActionListBoxItem *action_item + = static_cast(item); + action = action_item->action(); + } + + bool isWritable = action!=0L && action->isWritable(); + m_view->deleteButton->setEnabled( isWritable ); + m_view->editButton->setEnabled( isWritable ); + m_view->addButton->setEnabled( TRUE ); + m_view->toggleAutoButton->setEnabled( action!=0L && !m_mimetype.isEmpty() ); +} + +void NotifierModule::slotMimeTypeChanged(int index) +{ + if ( index == 0 ) + { + m_mimetype = TQString(); + } + else + { + TQListBoxItem *item = m_view->mimetypesCombo->listBox()->item( index ); + MimetypeListBoxItem *mime_item + = static_cast( item ); + m_mimetype = mime_item->mimetype(); + } + + updateListBox(); +} + +void NotifierModule::slotAdd() +{ + NotifierServiceAction *action = new NotifierServiceAction(); + ServiceConfigDialog dialog(action, m_settings.supportedMimetypes(), this); + + int value = dialog.exec(); + + if ( value == TQDialog::Accepted ) + { + m_settings.addAction( action ); + updateListBox(); + emit changed( true ); + } + else + { + delete action; + } +} + +void NotifierModule::slotEdit() +{ + ActionListBoxItem *action_item + = static_cast(m_view->actionsList->selectedItem()); + + NotifierServiceAction * action = dynamic_cast( action_item->action() ); + if ( action ) + { + ServiceConfigDialog dialog(action, m_settings.supportedMimetypes(), this); + + int value = dialog.exec(); + + if ( value == TQDialog::Accepted ) + { + updateListBox(); + emit changed( true ); + } + } +} + +void NotifierModule::slotDelete() +{ + ActionListBoxItem *action_item + = static_cast(m_view->actionsList->selectedItem()); + + NotifierServiceAction *action; + action = dynamic_cast( action_item->action() ); + if ( action ) + { + m_settings.deleteAction( action ); + updateListBox(); + emit changed( true ); + } +} + +void NotifierModule::slotToggleAuto() +{ + ActionListBoxItem *action_item + = static_cast( m_view->actionsList->selectedItem() ); + NotifierAction *action = action_item->action(); + + int index = m_view->actionsList->index( action_item ); + + if ( action->autoMimetypes().contains( m_mimetype ) ) + { + m_settings.resetAutoAction( m_mimetype ); + } + else + { + m_settings.setAutoAction( m_mimetype, action ); + } + + updateListBox(); + emit changed( true ); + + m_view->actionsList->setSelected( index, true ); +} + +#include "notifiermodule.moc" diff --git a/kioslave/media/tdecmodule/notifiermodule.h b/kioslave/media/tdecmodule/notifiermodule.h new file mode 100644 index 000000000..d5d97a96d --- /dev/null +++ b/kioslave/media/tdecmodule/notifiermodule.h @@ -0,0 +1,58 @@ +/* This file is part of the KDE Project + Copyright (c) 2005 Jean-Remy Falleri + Copyright (c) 2005 K�vin Ottens + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License version 2 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef _NOTIFIERMODULE_H_ +#define _NOTIFIERMODULE_H_ + +#include +#include + +#include "notifiersettings.h" +#include "notifiermoduleview.h" + +class NotifierModule : public TDECModule +{ + Q_OBJECT + +public: + NotifierModule( TQWidget* parent = 0, const char* name = 0); + ~NotifierModule(); + + void load(); + void save(); + void defaults(); + +private slots: + void slotAdd(); + void slotDelete(); + void slotEdit(); + void slotToggleAuto(); + + void slotActionSelected( TQListBoxItem * item ); + void slotMimeTypeChanged( int index ); + +private: + void updateListBox(); + + TQString m_mimetype; + NotifierSettings m_settings; + NotifierModuleView *m_view; +}; + +#endif diff --git a/kioslave/media/tdecmodule/notifiermoduleview.ui b/kioslave/media/tdecmodule/notifiermoduleview.ui new file mode 100644 index 000000000..ad508c03d --- /dev/null +++ b/kioslave/media/tdecmodule/notifiermoduleview.ui @@ -0,0 +1,171 @@ + +NotifierModuleView + + + NotifierModuleView + + + + 0 + 0 + 600 + 480 + + + + + unnamed + + + + layout4 + + + + unnamed + + + + layout2 + + + + unnamed + + + + mediumType + + + + 5 + 5 + 0 + 0 + + + + Medium types: + + + + + mimetypesCombo + + + + 3 + 0 + 0 + 0 + + + + Here is the list of the available types of medium which can be monitored. You can filter the available actions by selecting a type of medium. If you want to see all the actions, select "All Mime Types". + + + + + + + layout3 + + + + unnamed + + + + layout1 + + + + unnamed + + + + addButton + + + &Add... + + + Click here to add an action. + + + + + deleteButton + + + &Delete + + + Click here to delete the selected action if possible. + + + + + editButton + + + &Edit... + + + Click here to edit the selected action if possible. + + + + + toggleAutoButton + + + &Toggle as Auto Action + + + Click here to perform this action automatically on detection of the selected medium type (this option is disabled when "All Mime Types" is selected). + + + + + + + buttonSpacer + + + Vertical + + + Expanding + + + + 70 + 101 + + + + + + actionsList + + + Here is the list of the available actions. You can modify them by using the buttons on your right. + + + + + + + + + + + kcombobox.h + kpushbutton.h + kpushbutton.h + kpushbutton.h + kpushbutton.h + klistbox.h + + diff --git a/kioslave/media/tdecmodule/serviceconfigdialog.cpp b/kioslave/media/tdecmodule/serviceconfigdialog.cpp new file mode 100644 index 000000000..61dd060f2 --- /dev/null +++ b/kioslave/media/tdecmodule/serviceconfigdialog.cpp @@ -0,0 +1,151 @@ +/* This file is part of the KDE Project + Copyright (c) 2005 Jean-Remy Falleri + Copyright (c) 2005 Kévin Ottens + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License version 2 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include "serviceconfigdialog.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +#include "mimetypelistboxitem.h" + +ServiceConfigDialog::ServiceConfigDialog(NotifierServiceAction *action, + const TQStringList &mimetypesList, + TQWidget* parent, const char* name) + : KDialogBase(parent, name, true, i18n("Edit Service"), Ok|Cancel, Ok, true), + m_action(action) +{ + m_view = new ServiceView(this); + + m_view->iconButton->setIcon( m_action->iconName() ); + m_view->labelEdit->setText( m_action->label() ); + m_view->commandEdit->setText( m_action->service().m_strExec ); + + TQIconSet iconSet = SmallIconSet("configure"); + TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); + m_view->commandButton->setIconSet( iconSet ); + m_view->commandButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); + + m_iconChanged = false; + + TQStringList all_mimetypes = mimetypesList; + TQStringList action_mimetypes = action->mimetypes(); + + TQStringList::iterator it = all_mimetypes.begin(); + TQStringList::iterator end = all_mimetypes.end(); + + for ( ; it!=end; ++it ) + { + TQListBox *list; + + if ( action_mimetypes.contains( *it ) ) + { + list = m_view->mimetypesSelector->selectedListBox(); + } + else + { + list = m_view->mimetypesSelector->availableListBox(); + } + + new MimetypeListBoxItem( *it, list ); + } + + setMainWidget(m_view); + setCaption( m_action->label() ); + + connect( m_view->iconButton, TQT_SIGNAL( iconChanged(TQString) ), + this, TQT_SLOT( slotIconChanged() ) ); + connect( m_view->commandButton, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( slotCommand() ) ); +} + +bool operator==( KDEDesktopMimeType::Service s1, KDEDesktopMimeType::Service s2 ) +{ + return ( s1.m_strName==s2.m_strName ) + && ( s1.m_strIcon==s2.m_strIcon ) + && ( s1.m_strExec==s2.m_strExec ); +} + +bool operator!=( KDEDesktopMimeType::Service s1, KDEDesktopMimeType::Service s2 ) +{ + return !( s1==s2 ); +} + +void ServiceConfigDialog::slotOk() +{ + KDEDesktopMimeType::Service service; + service.m_strName = m_view->labelEdit->text(); + service.m_strIcon = m_view->iconButton->icon(); + service.m_strExec = m_view->commandEdit->text(); + + TQStringList mimetypes; + + uint list_count = m_view->mimetypesSelector->selectedListBox()->count(); + for( uint i=0; i < list_count; ++i ) + { + TQListBoxItem *item = m_view->mimetypesSelector->selectedListBox()->item(i); + MimetypeListBoxItem *mime_item = static_cast( item ); + mimetypes.append( mime_item->mimetype() ); + } + + if ( service!=m_action->service() || mimetypes!=m_action->mimetypes() ) + { + m_action->setService( service ); + m_action->setMimetypes( mimetypes ); + accept(); + } + else + { + reject(); + } +} + +void ServiceConfigDialog::slotIconChanged() +{ + m_iconChanged = true; +} + +void ServiceConfigDialog::slotCommand() +{ + KOpenWithDlg d(this); + int value = d.exec(); + if ( value == TQDialog::Accepted ) + { + KService::Ptr service = d.service(); + if ( service != 0L ) + { + m_view->commandEdit->setText( service->exec() ); + if ( m_iconChanged == false ) + { + m_view->iconButton->setIcon( service->icon() ); + } + } + } +} + +#include "serviceconfigdialog.moc" diff --git a/kioslave/media/tdecmodule/serviceconfigdialog.h b/kioslave/media/tdecmodule/serviceconfigdialog.h new file mode 100644 index 000000000..24e907205 --- /dev/null +++ b/kioslave/media/tdecmodule/serviceconfigdialog.h @@ -0,0 +1,48 @@ +/* This file is part of the KDE Project + Copyright (c) 2005 Jean-Remy Falleri + Copyright (c) 2005 Kvin Ottens + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License version 2 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef _SERVICECONFIGDIALOG_H_ +#define _SERVICECONFIGDIALOG_H_ + +#include + +#include "notifierserviceaction.h" +#include "serviceview.h" + +class ServiceConfigDialog : public KDialogBase +{ + Q_OBJECT + +public: + ServiceConfigDialog(NotifierServiceAction *action, + const TQStringList &mimetypesList, + TQWidget* parent = 0, const char* name = 0); + +public slots: + void slotOk(); + void slotIconChanged(); + void slotCommand(); + +private: + ServiceView *m_view; + NotifierServiceAction *m_action; + bool m_iconChanged; +}; + +#endif diff --git a/kioslave/media/tdecmodule/serviceview.ui b/kioslave/media/tdecmodule/serviceview.ui new file mode 100644 index 000000000..a6c3063f6 --- /dev/null +++ b/kioslave/media/tdecmodule/serviceview.ui @@ -0,0 +1,248 @@ + +ServiceView + + + ServiceView + + + + 0 + 0 + 664 + 503 + + + + + 3 + 3 + 0 + 0 + + + + + 640 + 480 + + + + Edit Service + + + + unnamed + + + + groupBox1 + + + + 7 + 7 + 0 + 0 + + + + Edit Service + + + + unnamed + + + + layout8 + + + + unnamed + + + + layout6 + + + + unnamed + + + + iconButton + + + + 0 + 0 + 0 + 0 + + + + + 40 + 40 + + + + + 40 + 40 + + + + + + + 32 + + + + + layout5 + + + + unnamed + + + + spacer4 + + + Vertical + + + Minimum + + + + 20 + 20 + + + + + + labelEdit + + + + 7 + 0 + 0 + 0 + + + + + + spacer5 + + + Vertical + + + Minimum + + + + 20 + 21 + + + + + + + + + + line1 + + + HLine + + + Sunken + + + Horizontal + + + + + mimetypesSelector + + + + 5 + 5 + 0 + 0 + + + + Available &medium types: + + + Displa&y service for: + + + false + + + + + layout7 + + + + unnamed + + + + m_lbCommmand + + + + 1 + 1 + 0 + 0 + + + + Command: + + + + + commandEdit + + + + + commandButton + + + + + + + + + + + + + kicondialog.h + klineedit.h + kactionselector.h + kactivelabel.h + klineedit.h + kpushbutton.h + + diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.h b/konqueror/sidebar/trees/history_module/kcmhistory.h index 5731ae267..ac82cdd60 100644 --- a/konqueror/sidebar/trees/history_module/kcmhistory.h +++ b/konqueror/sidebar/trees/history_module/kcmhistory.h @@ -21,7 +21,7 @@ #ifndef __kcmhistory_h__ #define __kcmhistory_h__ -#include +#include class KonqHistoryManager; class KonqSidebarHistorySettings; diff --git a/ksplashml/kcmksplash/main.cpp b/ksplashml/kcmksplash/main.cpp index cceebc0e1..3344145a5 100644 --- a/ksplashml/kcmksplash/main.cpp +++ b/ksplashml/kcmksplash/main.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include #include diff --git a/kxkb/kcmlayout.h b/kxkb/kcmlayout.h index 14d9e734e..769b08048 100644 --- a/kxkb/kcmlayout.h +++ b/kxkb/kcmlayout.h @@ -2,7 +2,7 @@ #define __KCM_LAYOUT_H__ -#include +#include #include #include diff --git a/kxkb/kcmmisc.h b/kxkb/kcmmisc.h index b40f50a0d..603de53bd 100644 --- a/kxkb/kcmmisc.h +++ b/kxkb/kcmmisc.h @@ -26,7 +26,7 @@ #include -#include +#include class KeyboardConfigWidget; diff --git a/tdeprint/printmgr/kcmprintmgr.h b/tdeprint/printmgr/kcmprintmgr.h index 18cf68a91..f2ce5dfea 100644 --- a/tdeprint/printmgr/kcmprintmgr.h +++ b/tdeprint/printmgr/kcmprintmgr.h @@ -20,7 +20,7 @@ #ifndef KCMPRINTMGR_H #define KCMPRINTMGR_H -#include +#include class KMMainView; diff --git a/twin/kcmtwin/twindecoration/twindecoration.cpp b/twin/kcmtwin/twindecoration/twindecoration.cpp index 30695cdef..788a0d3e7 100644 --- a/twin/kcmtwin/twindecoration/twindecoration.cpp +++ b/twin/kcmtwin/twindecoration/twindecoration.cpp @@ -834,7 +834,7 @@ void KWinDecorationModule::writeConfig( TDEConfig* conf ) oldLibraryName = currentLibraryName; currentLibraryName = libName; - // We saved, so tell kcmodule that there have been no new user changes made. + // We saved, so tell tdecmodule that there have been no new user changes made. emit TDECModule::changed(false); } diff --git a/twin/kcmtwin/twindecoration/twindecoration.h b/twin/kcmtwin/twindecoration/twindecoration.h index 14e24c777..49af27d71 100644 --- a/twin/kcmtwin/twindecoration/twindecoration.h +++ b/twin/kcmtwin/twindecoration/twindecoration.h @@ -30,7 +30,7 @@ #ifndef KWINDECORATION_H #define KWINDECORATION_H -#include +#include #include #include #include diff --git a/twin/kcmtwin/twinoptions/main.h b/twin/kcmtwin/twinoptions/main.h index 4935cf39f..c1146fa92 100644 --- a/twin/kcmtwin/twinoptions/main.h +++ b/twin/kcmtwin/twinoptions/main.h @@ -26,7 +26,7 @@ #define __MAIN_H__ #include -#include +#include class TDEConfig; class KFocusConfig; diff --git a/twin/kcmtwin/twinoptions/mouse.h b/twin/kcmtwin/twinoptions/mouse.h index 70ff2bfca..772bc5ac9 100644 --- a/twin/kcmtwin/twinoptions/mouse.h +++ b/twin/kcmtwin/twinoptions/mouse.h @@ -25,7 +25,7 @@ class TDEConfig; #include -#include +#include #include #include diff --git a/twin/kcmtwin/twinoptions/windows.h b/twin/kcmtwin/twinoptions/windows.h index f0b0bcd9f..10424207d 100644 --- a/twin/kcmtwin/twinoptions/windows.h +++ b/twin/kcmtwin/twinoptions/windows.h @@ -23,7 +23,7 @@ #define __KWINDOWCONFIG_H__ #include -#include +#include #include class TQRadioButton; diff --git a/twin/kcmtwin/twinrules/kcm.h b/twin/kcmtwin/twinrules/kcm.h index 1237a5a64..33d7c2664 100644 --- a/twin/kcmtwin/twinrules/kcm.h +++ b/twin/kcmtwin/twinrules/kcm.h @@ -20,7 +20,7 @@ #ifndef __KCM_H__ #define __KCM_H__ -#include +#include #include class TDEConfig; -- cgit v1.2.3