From 0ba3ad1ab1d2d1e234a432a09f7b35f410fce24c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 29 Jul 2013 14:42:48 -0500 Subject: [PATCH 01/13] Fix incorrect classification of DVD DL disks --- tdecore/tdehardwaredevices.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tdecore/tdehardwaredevices.cpp b/tdecore/tdehardwaredevices.cpp index 69e7856cb..73c3a0703 100644 --- a/tdecore/tdehardwaredevices.cpp +++ b/tdecore/tdehardwaredevices.cpp @@ -3096,8 +3096,6 @@ TDEDiskDeviceType::TDEDiskDeviceType classifyDiskType(udev_device* dev, const TQ || (TQString(udev_device_get_property_value(dev, "ID_CDROM_MEDIA_BD_R_DL")) == "1") || (TQString(udev_device_get_property_value(dev, "ID_CDROM_MEDIA_BD_PLUS_R")) == "1") || (TQString(udev_device_get_property_value(dev, "ID_CDROM_MEDIA_BD_MINUS_R")) == "1") - || (TQString(udev_device_get_property_value(dev, "ID_CDROM_MEDIA_DVD_PLUS_R_DL")) == "1") - || (TQString(udev_device_get_property_value(dev, "ID_CDROM_MEDIA_DVD_MINUS_R_DL")) == "1") ) { disktype = disktype | TDEDiskDeviceType::BDRW; // FIXME disktype = disktype & ~TDEDiskDeviceType::BDROM; @@ -3106,8 +3104,6 @@ TDEDiskDeviceType::TDEDiskDeviceType classifyDiskType(udev_device* dev, const TQ || (TQString(udev_device_get_property_value(dev, "ID_CDROM_MEDIA_BD_RW_DL")) == "1") || (TQString(udev_device_get_property_value(dev, "ID_CDROM_MEDIA_BD_PLUS_RW")) == "1") || (TQString(udev_device_get_property_value(dev, "ID_CDROM_MEDIA_BD_MINUS_RW")) == "1") - || (TQString(udev_device_get_property_value(dev, "ID_CDROM_MEDIA_DVD_PLUS_RW_DL")) == "1") - || (TQString(udev_device_get_property_value(dev, "ID_CDROM_MEDIA_DVD_MINUS_RW_DL")) == "1") ) { disktype = disktype | TDEDiskDeviceType::BDRW; disktype = disktype & ~TDEDiskDeviceType::BDROM; From 5da63fe957a5725d18bf2bdf92b5648815a444cc Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Wed, 31 Jul 2013 20:22:32 -0500 Subject: [PATCH 02/13] Fix application menu. This partially resolves bug report 1563. --- kded/CMakeLists.txt | 2 +- kded/applications.menu | 907 ---------------------------------- kded/applications.menu-no-kde | 568 --------------------- kded/tdebuildsycoca.cpp | 2 +- 4 files changed, 2 insertions(+), 1477 deletions(-) delete mode 100644 kded/applications.menu delete mode 100644 kded/applications.menu-no-kde diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt index ee693fb4a..bb54e2912 100644 --- a/kded/CMakeLists.txt +++ b/kded/CMakeLists.txt @@ -35,7 +35,7 @@ install( FILES kdedmodule.h DESTINATION ${INCLUDE_INSTALL_DIR} ) ##### other data ################################ install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) -install( FILES applications.menu applications.menu-no-kde DESTINATION ${XDG_MENU_INSTALL_DIR} ) +install( FILES tde-applications.menu tde-applications.menu-no-kde DESTINATION ${XDG_MENU_INSTALL_DIR} ) install( FILES kded.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) diff --git a/kded/applications.menu b/kded/applications.menu deleted file mode 100644 index 631aab059..000000000 --- a/kded/applications.menu +++ /dev/null @@ -1,907 +0,0 @@ - - - - Applications - tde-main.directory - - - - - - - - - More - - - - Applications - - - - - Applications - tde-unknown.directory - - - - - - Core - TDE - - - X-SuSE-YaST - - - - - Development - tde-development.directory - - X-TDE-TDevelopIDE - tde-development-tdevelop.directory - - - Development - X-TDE-TDevelopIDE - KDE - - - - - Translation - tde-development-translation.directory - - - Development - Translation - KDE - - - - - Web Development - tde-development-webdevelopment.directory - - - Development - WebDevelopment - KDE - - - - - - Development - X-TDE-TDevelopIDE - Translation - WebDevelopment - KDE - - - - KDE - kde-development.directory - - - Development - KDE - Translation - WebDevelopment - TDE - - - - Translation - kde-development-translation.directory - - - Development - Translation - KDE - TDE - - - - - Web Development - kde-development-webdevelopment.directory - - - Development - WebDevelopment - KDE - TDE - - - - - - - Science - tde-science.directory - - - - Astronomy - Biology - Chemistry - Geology - MedicalSoftware - Physics - Math - Science - - Education - KDE - - - - - Edutainment - tde-edutainment.directory - - Languages - tde-edu-languages.directory - - - Education - - Languages - X-TDE-Edu-Language - - KDE - - - - - Mathematics - tde-edu-mathematics.directory - - - Education - Math - KDE - - - - - Miscellaneous - tde-edu-miscellaneous.directory - - - Education - - Languages - X-TDE-Edu-Language - Math - Science - Teaching - X-TDE-Edu-Teaching - KDE - - - - - - Science - tde-edu-science.directory - - - Education - Science - KDE - - - - - Tools - tde-edu-tools.directory - - - Education - - Teaching - X-TDE-Edu-Teaching - - KDE - - - - - KDE - kde-edutainment.directory - - - Education - KDE - - Education - Languages - X-TDE-Edu-Language - X-KDE-Edu-Language - Math - Science - Teaching - X-TDE-Edu-Teaching - X-KDE-Edu-Teaching - TDE - - - - - Languages - kde-edu-languages.directory - - - Languages - KDE - TDE - - - - - Mathematics - kde-edu-mathematics.directory - - - Math - KDE - TDE - - - - - Miscellaneous - kde-edu-miscellaneous.directory - - - Education - KDE - - Languages - X-TDE-Edu-Language - X-KDE-Edu-Language - Math - Science - Teaching - X-TDE-Edu-Teaching - X-KDE-Edu-Teaching - TDE - - - - - - Science - kde-edu-science.directory - - - Science - KDE - TDE - - - - - Tools - kde-edu-tools.directory - - - Teaching - KDE - TDE - - - - - - - Games - tde-games.directory - - Arcade - tde-games-arcade.directory - - - Game - ArcadeGame - KDE - - - - - Board - tde-games-board.directory - - - Game - BoardGame - KDE - - - - - Card - tde-games-card.directory - - - Game - CardGame - KDE - - - - - Kidsgames - tde-games-kids.directory - - - Game - - X-TDE-KidsGame - KidsGame - - KDE - - - - - TacticStrategy - tde-games-strategy.directory - - - Game - StrategyGame - KDE - - - - - - Game - - ArcadeGame - BoardGame - CardGame - X-TDE-KidsGame - KidsGame - StrategyGame - KDE - - - - - KDE - kde-games.directory - - Arcade - kde-games-arcade.directory - - - Game - ArcadeGame - KDE - TDE - - - - - Board - kde-games-board.directory - - - Game - BoardGame - KDE - TDE - - - - - Card - kde-games-card.directory - - - Game - CardGame - KDE - TDE - - - - - Kidsgames - kde-games-kids.directory - - - Game - KidsGame - KDE - TDE - - - - - TacticStrategy - kde-games-strategy.directory - - - Game - StrategyGame - KDE - TDE - - - - - - Game - KDE - - ArcadeGame - BoardGame - CardGame - X-TDE-KidsGame - KidsGame - StrategyGame - TDE - - - - - - - Graphics - tde-graphics.directory - - - Graphics - X-TDE-More - X-KDE-More - KDE - ooo-draw.desktop - - - - KDE - kde-graphics.directory - - - Graphics - KDE - - - - - More - tde-more.directory - - - Graphics - X-TDE-More - X-KDE-More - KDE - - - - - - Internet - tde-internet.directory - - - Network - X-TDE-More - X-KDE-More - KDE - - - - Terminal - tde-internet-terminal.directory - - - More - tde-more.directory - - - Network - X-TDE-More - X-KDE-More - KDE - - - - - KDE - kde-internet.directory - - - Network - KDE - - - - - - Multimedia - tde-multimedia.directory - - - AudioVideo - X-TDE-More - X-KDE-More - KDE - - - - More - tde-more.directory - - - AudioVideo - X-TDE-More - X-KDE-More - KDE - - - - - KDE - kde-multimedia.directory - - - AudioVideo - KDE - - - - - - Office - tde-office.directory - - - - - More - - - - Office - X-TDE-Office-PIM - X-TDE-More - X-KDE-More - KDE - - ooo-draw.desktop - - - Personal Information Management - tde-office-pim.directory - - - X-TDE-Office-PIM - - - - - More - tde-more.directory - - - Office - X-TDE-More - X-KDE-More - KDE - - - - - KDE - kde-office.directory - - - Office - KDE - - - - - - Settingsmenu - tde-settingsmenu.directory - - - Settings - KDE - X-KDE-settings-sound - - - - KDE - kde-settingsmenu.directory - - - Settings - KDE - - - - - - System - tde-system.directory - - - System - X-TDE-More - X-KDE-More - KDE - - - - SuperUser - tde-system-su.directory - - - X-TDE-System-su - X-TDE-More - X-KDE-More - X-KDE-System-su - KDE - - - - - More - tde-more.directory - - - System - X-TDE-More - X-KDE-More - KDE - - - - - KDE - kde-system.directory - - - System - KDE - - - - - ScreenSavers - tde-system-screensavers.directory - - - Terminal - tde-system-terminal.directory - - - - Utilities - tde-utilities.directory - - - Utility - - Accessibility - X-TDE-Utilities-Desktop - X-TDE-Utilities-File - X-TDE-Utilities-Peripherals - X-TDE-Utilities-PIM - TextEditor - X-TDE-More - KDE - - - - - Accessibility - tde-utilities-accessibility.directory - - - Utility - Accessibility - KDE - - - - - Desktop - tde-utilities-desktop.directory - - - Utility - X-TDE-Utilities-Desktop - KDE - - - - - Editors - tde-editors.directory - - - TextEditor - KDE - - - - - File - tde-utilities-file.directory - - - Utility - X-TDE-Utilities-File - - - - - Peripherals - tde-utilities-peripherals.directory - - - Utility - X-TDE-Utilities-Peripherals - - - - - Personal Information Management - tde-utilities-pim.directory - - - Utility - X-TDE-Utilities-PIM - KDE - X-KDE-Utilities-PIM - - - - - Toys - tde-toys.directory - - - Amusement - KDE - - - - - XUtilities - tde-utilities-xutils.directory - - - More - tde-more.directory - - - Utility - X-TDE-More - X-KDE-More - KDE - - - - - More - tde-more.directory - - - Utility - X-TDE-More - X-KDE-More - KDE - - - - - KDE - kde-utilities.directory - - - Utility - KDE - - Accessibility - X-TDE-Utilities-Desktop - X-KDE-Utilities-Desktop - X-TDE-Utilities-Peripherals - X-TDE-Utilities-PIM - X-KDE-Utilities-PIM - X-TDE-More - X-KDE-More - TextEditor - TDE - - - - - Accessibility - kde-utilities-accessibility.directory - - - Utility - Accessibility - KDE - TDE - - - - - Desktop - kde-utilities-desktop.directory - - - Utility - X-KDE-Utilities-Desktop - KDE - TDE - - - - - Editors - kde-editors.directory - - - TextEditor - KDE - TDE - - - - - Personal Information Management - kde-utilities-pim.directory - - - Utility - X-KDE-Utilities-PIM - KDE - TDE - - - - - Toys - kde-toys.directory - - - Amusement - KDE - TDE - - - - - - - - TDE - Core - - - - - - Debian - debian.directory - debian-menu.menu - - - applications-merged - applications-kmenuedit.menu - diff --git a/kded/applications.menu-no-kde b/kded/applications.menu-no-kde deleted file mode 100644 index 102111c67..000000000 --- a/kded/applications.menu-no-kde +++ /dev/null @@ -1,568 +0,0 @@ - - - - Applications - tde-main.directory - - - - - - - - - More - - - - Applications - - - - - Applications - tde-unknown.directory - - - - - - Core - TDE - - - X-SuSE-YaST - - KDE - - - - - Development - tde-development.directory - - X-TDE-TDevelopIDE - tde-development-tdevelop.directory - - - Development - X-TDE-TDevelopIDE - KDE - X-KDE-KDevelopIDE - - - - - Translation - tde-development-translation.directory - - - Development - Translation - KDE - - - - - Web Development - tde-development-webdevelopment.directory - - - Development - WebDevelopment - KDE - - - - - - Development - X-TDE-TDevelopIDE - Translation - WebDevelopment - KDE - - - - - Science - tde-science.directory - - - - Astronomy - Biology - Chemistry - Geology - MedicalSoftware - Physics - Math - Science - - Education - KDE - - - - - Edutainment - tde-edutainment.directory - - Languages - tde-edu-languages.directory - - - Education - - Languages - X-TDE-Edu-Language - - KDE - - - - - Mathematics - tde-edu-mathematics.directory - - - Education - Math - KDE - - - - - Miscellaneous - tde-edu-miscellaneous.directory - - - Education - - Languages - X-TDE-Edu-Language - Math - Science - Teaching - X-TDE-Edu-Teaching - KDE - - - - - - Science - tde-edu-science.directory - - - Education - Science - KDE - - - - - Tools - tde-edu-tools.directory - - - Education - - Teaching - X-TDE-Edu-Teaching - - KDE - - - - - - Games - tde-games.directory - - Arcade - tde-games-arcade.directory - - - Game - ArcadeGame - KDE - - - - - Board - tde-games-board.directory - - - Game - BoardGame - KDE - - - - - Card - tde-games-card.directory - - - Game - CardGame - KDE - - - - - Kidsgames - tde-games-kids.directory - - - Game - - X-TDE-KidsGame - KidsGame - - KDE - - - - - TacticStrategy - tde-games-strategy.directory - - - Game - StrategyGame - KDE - - - - - - Game - - ArcadeGame - BoardGame - CardGame - X-TDE-KidsGame - KidsGame - StrategyGame - KDE - - - - - - Graphics - tde-graphics.directory - - - Graphics - X-TDE-More - X-KDE-More - KDE - ooo-draw.desktop - - - - More - tde-more.directory - - - Graphics - X-TDE-More - X-KDE-More - KDE - - - - - - Internet - tde-internet.directory - - - Network - X-TDE-More - X-KDE-More - KDE - - - - Terminal - tde-internet-terminal.directory - - - More - tde-more.directory - - - Network - X-TDE-More - X-KDE-More - KDE - - - - - - Multimedia - tde-multimedia.directory - - - AudioVideo - X-TDE-More - X-KDE-More - KDE - - - - More - tde-more.directory - - - AudioVideo - X-TDE-More - X-KDE-More - KDE - - - - - - Office - tde-office.directory - - - - - More - - - - Office - X-TDE-Office-PIM - X-TDE-More - X-KDE-More - KDE - - ooo-draw.desktop - - - Personal Information Management - tde-office-pim.directory - - - X-TDE-Office-PIM - - - - - More - tde-more.directory - - - Office - X-TDE-More - X-KDE-More - KDE - - - - - - Settingsmenu - tde-settingsmenu.directory - - - Settings - KDE - X-KDE-settings-sound - - - - - System - tde-system.directory - - - System - X-TDE-More - X-KDE-More - KDE - - - - SuperUser - tde-system-su.directory - - - X-TDE-System-su - X-TDE-More - X-KDE-More - X-KDE-System-su - KDE - - - - - More - tde-more.directory - - - System - X-TDE-More - X-KDE-More - KDE - - - - - ScreenSavers - tde-system-screensavers.directory - - - Terminal - tde-system-terminal.directory - - - - Utilities - tde-utilities.directory - - - Utility - Accessibility - X-TDE-Utilities-Desktop - X-TDE-Utilities-File - X-TDE-Utilities-Peripherals - X-TDE-Utilities-PIM - X-TDE-More - X-KDE-Utilities-Desktop - X-KDE-Utilities-Peripherals - X-KDE-Utilities-PIM - X-KDE-More - KDE - - - - Accessibility - tde-utilities-accessibility.directory - - - Utility - Accessibility - KDE - - - - - Desktop - tde-utilities-desktop.directory - - - Utility - X-TDE-Utilities-Desktop - KDE - - - - - Editors - tde-editors.directory - - - TextEditor - KDE - - - - - File - tde-utilities-file.directory - - - Utility - X-TDE-Utilities-File - - - - - Peripherals - tde-utilities-peripherals.directory - - - Utility - X-TDE-Utilities-Peripherals - - - - - Personal Information Management - tde-utilities-pim.directory - - - Utility - X-TDE-Utilities-PIM - KDE - X-KDE-Utilities-PIM - - - - - Toys - tde-toys.directory - - - Amusement - KDE - - - - - XUtilities - tde-utilities-xutils.directory - - - More - tde-more.directory - - - Utility - X-TDE-More - X-KDE-More - KDE - - - - - More - tde-more.directory - - - Utility - X-TDE-More - X-KDE-More - KDE - - - - - - - TDE - Core - - - - - - Debian - debian.directory - debian-menu.menu - - - applications-merged - applications-kmenuedit.menu - diff --git a/kded/tdebuildsycoca.cpp b/kded/tdebuildsycoca.cpp index 4325162f7..f7ae2ce3b 100644 --- a/kded/tdebuildsycoca.cpp +++ b/kded/tdebuildsycoca.cpp @@ -379,7 +379,7 @@ bool KBuildSycoca::build() connect(g_vfolder, TQT_SIGNAL(newService(const TQString &, KService **)), this, TQT_SLOT(slotCreateEntry(const TQString &, KService **))); - VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true); + VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("tde-applications.menu", true); KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0, false); entry->setLayoutInfo(kdeMenu->layoutList); From 6b1e323cd22f19d8517d344ce8ae4e0a19769028 Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Thu, 1 Aug 2013 17:58:16 +0200 Subject: [PATCH 03/13] Fix FTBFS on libudev includes --- tdecore/tdehardwaredevices.cpp | 2 ++ tdecore/tdehardwaredevices.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/tdecore/tdehardwaredevices.cpp b/tdecore/tdehardwaredevices.cpp index 73c3a0703..f66d7f678 100644 --- a/tdecore/tdehardwaredevices.cpp +++ b/tdecore/tdehardwaredevices.cpp @@ -33,7 +33,9 @@ #include #include +extern "C" { #include +} #include #include diff --git a/tdecore/tdehardwaredevices.h b/tdecore/tdehardwaredevices.h index fcf60533d..e7a7a3e26 100644 --- a/tdecore/tdehardwaredevices.h +++ b/tdecore/tdehardwaredevices.h @@ -27,7 +27,9 @@ #include "tdelibs_export.h" // udev includes +extern "C" { #include +} #include #include #include From 12b5e141be261b5ff652e8ec5153d50888859d1a Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Thu, 1 Aug 2013 18:03:42 +0200 Subject: [PATCH 04/13] Fix FTBFS due to libart location --- pics/CMakeLists.txt | 1 + tdecore/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/pics/CMakeLists.txt b/pics/CMakeLists.txt index b278a39c1..e5146680d 100644 --- a/pics/CMakeLists.txt +++ b/pics/CMakeLists.txt @@ -28,6 +28,7 @@ include_directories( link_directories( ${TQT_LIBRARY_DIRS} + ${LIBART_LIBRARY_DIRS} ) diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt index bff0e51d0..a201774f8 100644 --- a/tdecore/CMakeLists.txt +++ b/tdecore/CMakeLists.txt @@ -83,6 +83,7 @@ link_directories( ${TQT_LIBRARY_DIRS} ${LIBIDN_LIBRARY_DIRS} ${GAMIN_LIBDIR} + ${LIBART_LIBRARY_DIRS} ) ##### headers ################################### From fb86c5c8459927513b39b622e323c15abbd551ae Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Thu, 1 Aug 2013 18:06:52 +0200 Subject: [PATCH 05/13] Fix battery charge detection This resolves Bug 1514 --- tdecore/tdehardwaredevices.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tdecore/tdehardwaredevices.cpp b/tdecore/tdehardwaredevices.cpp index f66d7f678..f75df6e87 100644 --- a/tdecore/tdehardwaredevices.cpp +++ b/tdecore/tdehardwaredevices.cpp @@ -4716,6 +4716,15 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* exist if (nodename == "alarm") { bdevice->internalSetAlarmEnergy(line.toDouble()/1000000.0); } + if (nodename == "charge_full") { + bdevice->internalSetMaximumEnergy(line.toDouble()/1000000.0); + } + if (nodename == "charge_full_design") { + bdevice->internalSetMaximumDesignEnergy(line.toDouble()/1000000.0); + } + if (nodename == "charge_now") { + bdevice->internalSetEnergy(line.toDouble()/1000000.0); + } if (nodename == "energy_full") { bdevice->internalSetMaximumEnergy(line.toDouble()/1000000.0); } From cf1952a44719525ef5519bae6fd0a020512e67a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 1 Aug 2013 19:39:38 +0200 Subject: [PATCH 06/13] Add files omitted in commit 5da63fe9 --- kded/tde-applications.menu | 907 ++++++++++++++++++++++++++++++ kded/tde-applications.menu-no-kde | 568 +++++++++++++++++++ 2 files changed, 1475 insertions(+) create mode 100644 kded/tde-applications.menu create mode 100644 kded/tde-applications.menu-no-kde diff --git a/kded/tde-applications.menu b/kded/tde-applications.menu new file mode 100644 index 000000000..631aab059 --- /dev/null +++ b/kded/tde-applications.menu @@ -0,0 +1,907 @@ + + + + Applications + tde-main.directory + + + + + + + + + More + + + + Applications + + + + + Applications + tde-unknown.directory + + + + + + Core + TDE + + + X-SuSE-YaST + + + + + Development + tde-development.directory + + X-TDE-TDevelopIDE + tde-development-tdevelop.directory + + + Development + X-TDE-TDevelopIDE + KDE + + + + + Translation + tde-development-translation.directory + + + Development + Translation + KDE + + + + + Web Development + tde-development-webdevelopment.directory + + + Development + WebDevelopment + KDE + + + + + + Development + X-TDE-TDevelopIDE + Translation + WebDevelopment + KDE + + + + KDE + kde-development.directory + + + Development + KDE + Translation + WebDevelopment + TDE + + + + Translation + kde-development-translation.directory + + + Development + Translation + KDE + TDE + + + + + Web Development + kde-development-webdevelopment.directory + + + Development + WebDevelopment + KDE + TDE + + + + + + + Science + tde-science.directory + + + + Astronomy + Biology + Chemistry + Geology + MedicalSoftware + Physics + Math + Science + + Education + KDE + + + + + Edutainment + tde-edutainment.directory + + Languages + tde-edu-languages.directory + + + Education + + Languages + X-TDE-Edu-Language + + KDE + + + + + Mathematics + tde-edu-mathematics.directory + + + Education + Math + KDE + + + + + Miscellaneous + tde-edu-miscellaneous.directory + + + Education + + Languages + X-TDE-Edu-Language + Math + Science + Teaching + X-TDE-Edu-Teaching + KDE + + + + + + Science + tde-edu-science.directory + + + Education + Science + KDE + + + + + Tools + tde-edu-tools.directory + + + Education + + Teaching + X-TDE-Edu-Teaching + + KDE + + + + + KDE + kde-edutainment.directory + + + Education + KDE + + Education + Languages + X-TDE-Edu-Language + X-KDE-Edu-Language + Math + Science + Teaching + X-TDE-Edu-Teaching + X-KDE-Edu-Teaching + TDE + + + + + Languages + kde-edu-languages.directory + + + Languages + KDE + TDE + + + + + Mathematics + kde-edu-mathematics.directory + + + Math + KDE + TDE + + + + + Miscellaneous + kde-edu-miscellaneous.directory + + + Education + KDE + + Languages + X-TDE-Edu-Language + X-KDE-Edu-Language + Math + Science + Teaching + X-TDE-Edu-Teaching + X-KDE-Edu-Teaching + TDE + + + + + + Science + kde-edu-science.directory + + + Science + KDE + TDE + + + + + Tools + kde-edu-tools.directory + + + Teaching + KDE + TDE + + + + + + + Games + tde-games.directory + + Arcade + tde-games-arcade.directory + + + Game + ArcadeGame + KDE + + + + + Board + tde-games-board.directory + + + Game + BoardGame + KDE + + + + + Card + tde-games-card.directory + + + Game + CardGame + KDE + + + + + Kidsgames + tde-games-kids.directory + + + Game + + X-TDE-KidsGame + KidsGame + + KDE + + + + + TacticStrategy + tde-games-strategy.directory + + + Game + StrategyGame + KDE + + + + + + Game + + ArcadeGame + BoardGame + CardGame + X-TDE-KidsGame + KidsGame + StrategyGame + KDE + + + + + KDE + kde-games.directory + + Arcade + kde-games-arcade.directory + + + Game + ArcadeGame + KDE + TDE + + + + + Board + kde-games-board.directory + + + Game + BoardGame + KDE + TDE + + + + + Card + kde-games-card.directory + + + Game + CardGame + KDE + TDE + + + + + Kidsgames + kde-games-kids.directory + + + Game + KidsGame + KDE + TDE + + + + + TacticStrategy + kde-games-strategy.directory + + + Game + StrategyGame + KDE + TDE + + + + + + Game + KDE + + ArcadeGame + BoardGame + CardGame + X-TDE-KidsGame + KidsGame + StrategyGame + TDE + + + + + + + Graphics + tde-graphics.directory + + + Graphics + X-TDE-More + X-KDE-More + KDE + ooo-draw.desktop + + + + KDE + kde-graphics.directory + + + Graphics + KDE + + + + + More + tde-more.directory + + + Graphics + X-TDE-More + X-KDE-More + KDE + + + + + + Internet + tde-internet.directory + + + Network + X-TDE-More + X-KDE-More + KDE + + + + Terminal + tde-internet-terminal.directory + + + More + tde-more.directory + + + Network + X-TDE-More + X-KDE-More + KDE + + + + + KDE + kde-internet.directory + + + Network + KDE + + + + + + Multimedia + tde-multimedia.directory + + + AudioVideo + X-TDE-More + X-KDE-More + KDE + + + + More + tde-more.directory + + + AudioVideo + X-TDE-More + X-KDE-More + KDE + + + + + KDE + kde-multimedia.directory + + + AudioVideo + KDE + + + + + + Office + tde-office.directory + + + + + More + + + + Office + X-TDE-Office-PIM + X-TDE-More + X-KDE-More + KDE + + ooo-draw.desktop + + + Personal Information Management + tde-office-pim.directory + + + X-TDE-Office-PIM + + + + + More + tde-more.directory + + + Office + X-TDE-More + X-KDE-More + KDE + + + + + KDE + kde-office.directory + + + Office + KDE + + + + + + Settingsmenu + tde-settingsmenu.directory + + + Settings + KDE + X-KDE-settings-sound + + + + KDE + kde-settingsmenu.directory + + + Settings + KDE + + + + + + System + tde-system.directory + + + System + X-TDE-More + X-KDE-More + KDE + + + + SuperUser + tde-system-su.directory + + + X-TDE-System-su + X-TDE-More + X-KDE-More + X-KDE-System-su + KDE + + + + + More + tde-more.directory + + + System + X-TDE-More + X-KDE-More + KDE + + + + + KDE + kde-system.directory + + + System + KDE + + + + + ScreenSavers + tde-system-screensavers.directory + + + Terminal + tde-system-terminal.directory + + + + Utilities + tde-utilities.directory + + + Utility + + Accessibility + X-TDE-Utilities-Desktop + X-TDE-Utilities-File + X-TDE-Utilities-Peripherals + X-TDE-Utilities-PIM + TextEditor + X-TDE-More + KDE + + + + + Accessibility + tde-utilities-accessibility.directory + + + Utility + Accessibility + KDE + + + + + Desktop + tde-utilities-desktop.directory + + + Utility + X-TDE-Utilities-Desktop + KDE + + + + + Editors + tde-editors.directory + + + TextEditor + KDE + + + + + File + tde-utilities-file.directory + + + Utility + X-TDE-Utilities-File + + + + + Peripherals + tde-utilities-peripherals.directory + + + Utility + X-TDE-Utilities-Peripherals + + + + + Personal Information Management + tde-utilities-pim.directory + + + Utility + X-TDE-Utilities-PIM + KDE + X-KDE-Utilities-PIM + + + + + Toys + tde-toys.directory + + + Amusement + KDE + + + + + XUtilities + tde-utilities-xutils.directory + + + More + tde-more.directory + + + Utility + X-TDE-More + X-KDE-More + KDE + + + + + More + tde-more.directory + + + Utility + X-TDE-More + X-KDE-More + KDE + + + + + KDE + kde-utilities.directory + + + Utility + KDE + + Accessibility + X-TDE-Utilities-Desktop + X-KDE-Utilities-Desktop + X-TDE-Utilities-Peripherals + X-TDE-Utilities-PIM + X-KDE-Utilities-PIM + X-TDE-More + X-KDE-More + TextEditor + TDE + + + + + Accessibility + kde-utilities-accessibility.directory + + + Utility + Accessibility + KDE + TDE + + + + + Desktop + kde-utilities-desktop.directory + + + Utility + X-KDE-Utilities-Desktop + KDE + TDE + + + + + Editors + kde-editors.directory + + + TextEditor + KDE + TDE + + + + + Personal Information Management + kde-utilities-pim.directory + + + Utility + X-KDE-Utilities-PIM + KDE + TDE + + + + + Toys + kde-toys.directory + + + Amusement + KDE + TDE + + + + + + + + TDE + Core + + + + + + Debian + debian.directory + debian-menu.menu + + + applications-merged + applications-kmenuedit.menu + diff --git a/kded/tde-applications.menu-no-kde b/kded/tde-applications.menu-no-kde new file mode 100644 index 000000000..102111c67 --- /dev/null +++ b/kded/tde-applications.menu-no-kde @@ -0,0 +1,568 @@ + + + + Applications + tde-main.directory + + + + + + + + + More + + + + Applications + + + + + Applications + tde-unknown.directory + + + + + + Core + TDE + + + X-SuSE-YaST + + KDE + + + + + Development + tde-development.directory + + X-TDE-TDevelopIDE + tde-development-tdevelop.directory + + + Development + X-TDE-TDevelopIDE + KDE + X-KDE-KDevelopIDE + + + + + Translation + tde-development-translation.directory + + + Development + Translation + KDE + + + + + Web Development + tde-development-webdevelopment.directory + + + Development + WebDevelopment + KDE + + + + + + Development + X-TDE-TDevelopIDE + Translation + WebDevelopment + KDE + + + + + Science + tde-science.directory + + + + Astronomy + Biology + Chemistry + Geology + MedicalSoftware + Physics + Math + Science + + Education + KDE + + + + + Edutainment + tde-edutainment.directory + + Languages + tde-edu-languages.directory + + + Education + + Languages + X-TDE-Edu-Language + + KDE + + + + + Mathematics + tde-edu-mathematics.directory + + + Education + Math + KDE + + + + + Miscellaneous + tde-edu-miscellaneous.directory + + + Education + + Languages + X-TDE-Edu-Language + Math + Science + Teaching + X-TDE-Edu-Teaching + KDE + + + + + + Science + tde-edu-science.directory + + + Education + Science + KDE + + + + + Tools + tde-edu-tools.directory + + + Education + + Teaching + X-TDE-Edu-Teaching + + KDE + + + + + + Games + tde-games.directory + + Arcade + tde-games-arcade.directory + + + Game + ArcadeGame + KDE + + + + + Board + tde-games-board.directory + + + Game + BoardGame + KDE + + + + + Card + tde-games-card.directory + + + Game + CardGame + KDE + + + + + Kidsgames + tde-games-kids.directory + + + Game + + X-TDE-KidsGame + KidsGame + + KDE + + + + + TacticStrategy + tde-games-strategy.directory + + + Game + StrategyGame + KDE + + + + + + Game + + ArcadeGame + BoardGame + CardGame + X-TDE-KidsGame + KidsGame + StrategyGame + KDE + + + + + + Graphics + tde-graphics.directory + + + Graphics + X-TDE-More + X-KDE-More + KDE + ooo-draw.desktop + + + + More + tde-more.directory + + + Graphics + X-TDE-More + X-KDE-More + KDE + + + + + + Internet + tde-internet.directory + + + Network + X-TDE-More + X-KDE-More + KDE + + + + Terminal + tde-internet-terminal.directory + + + More + tde-more.directory + + + Network + X-TDE-More + X-KDE-More + KDE + + + + + + Multimedia + tde-multimedia.directory + + + AudioVideo + X-TDE-More + X-KDE-More + KDE + + + + More + tde-more.directory + + + AudioVideo + X-TDE-More + X-KDE-More + KDE + + + + + + Office + tde-office.directory + + + + + More + + + + Office + X-TDE-Office-PIM + X-TDE-More + X-KDE-More + KDE + + ooo-draw.desktop + + + Personal Information Management + tde-office-pim.directory + + + X-TDE-Office-PIM + + + + + More + tde-more.directory + + + Office + X-TDE-More + X-KDE-More + KDE + + + + + + Settingsmenu + tde-settingsmenu.directory + + + Settings + KDE + X-KDE-settings-sound + + + + + System + tde-system.directory + + + System + X-TDE-More + X-KDE-More + KDE + + + + SuperUser + tde-system-su.directory + + + X-TDE-System-su + X-TDE-More + X-KDE-More + X-KDE-System-su + KDE + + + + + More + tde-more.directory + + + System + X-TDE-More + X-KDE-More + KDE + + + + + ScreenSavers + tde-system-screensavers.directory + + + Terminal + tde-system-terminal.directory + + + + Utilities + tde-utilities.directory + + + Utility + Accessibility + X-TDE-Utilities-Desktop + X-TDE-Utilities-File + X-TDE-Utilities-Peripherals + X-TDE-Utilities-PIM + X-TDE-More + X-KDE-Utilities-Desktop + X-KDE-Utilities-Peripherals + X-KDE-Utilities-PIM + X-KDE-More + KDE + + + + Accessibility + tde-utilities-accessibility.directory + + + Utility + Accessibility + KDE + + + + + Desktop + tde-utilities-desktop.directory + + + Utility + X-TDE-Utilities-Desktop + KDE + + + + + Editors + tde-editors.directory + + + TextEditor + KDE + + + + + File + tde-utilities-file.directory + + + Utility + X-TDE-Utilities-File + + + + + Peripherals + tde-utilities-peripherals.directory + + + Utility + X-TDE-Utilities-Peripherals + + + + + Personal Information Management + tde-utilities-pim.directory + + + Utility + X-TDE-Utilities-PIM + KDE + X-KDE-Utilities-PIM + + + + + Toys + tde-toys.directory + + + Amusement + KDE + + + + + XUtilities + tde-utilities-xutils.directory + + + More + tde-more.directory + + + Utility + X-TDE-More + X-KDE-More + KDE + + + + + More + tde-more.directory + + + Utility + X-TDE-More + X-KDE-More + KDE + + + + + + + TDE + Core + + + + + + Debian + debian.directory + debian-menu.menu + + + applications-merged + applications-kmenuedit.menu + From be31b51dbc54328b836ebe216ff5c59c017f1c51 Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Thu, 1 Aug 2013 19:05:28 -0500 Subject: [PATCH 07/13] Fix FTBFS when xrender is missing. This resolves bug report 1554. --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index b9d179433..324f07b66 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -591,6 +591,8 @@ endif( XRANDR_FOUND ) pkg_search_module( XRENDER xrender ) if( XRENDER_FOUND ) set( HAVE_XRENDER 1 ) +else( XRENDER_FOUND) + message(FATAL_ERROR "\nxrender support is required, but not found on your system" ) endif( XRENDER_FOUND ) ##### check for xcomposite ######################### From 5ee8849b092e8f3ecabf08fa959006a7e99e58b7 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Thu, 1 Aug 2013 19:34:37 -0500 Subject: [PATCH 08/13] Update VERSION in root CMakeLists.txt. This partially resolves bug report 1595. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 324f07b66..11c6149bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ cmake_minimum_required( VERSION 2.8 ) project( tdelibs ) set( PACKAGE tdelibs ) -set( VERSION "3.5.13" ) +set( VERSION R14.0.0 ) ##### include essential cmake modules ########### From 6f4fd5e5632b2288a483430c625081a51342fdab Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 6 Aug 2013 09:35:49 -0500 Subject: [PATCH 09/13] Allow TDEApplication objects to be constructed without a session manager This relates to Bug 760 --- tdecore/tdeapplication.cpp | 35 +++++++++++++++++++++++++++++++++++ tdecore/tdeapplication.h | 12 ++++++++++-- 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp index 58b010e4e..857c157e8 100644 --- a/tdecore/tdeapplication.cpp +++ b/tdecore/tdeapplication.cpp @@ -35,7 +35,14 @@ #undef QT_NO_TRANSLATION #undef TQT_NO_TRANSLATION #include + +// FIXME +// FOR BINARY COMPATIBILITY ONLY +// REMOVE WHEN PRACTICAL! +#define TDEAPPLICATION_BINARY_COMPAT_HACK 1 #include "tdeapplication.h" +#undef TDEAPPLICATION_BINARY_COMPAT_HACK + #define QT_NO_TRANSLATION #define TQT_NO_TRANSLATION #include @@ -621,6 +628,34 @@ static SmcConn tmpSmcConnection = 0; #endif static TQTime* smModificationTime = 0; +TDEApplication::TDEApplication( int& argc, char** argv, const TQCString& rAppName, + bool allowStyles, bool GUIenabled, bool SMenabled ) : + TQApplication( argc, argv, GUIenabled, SMenabled ), TDEInstance(rAppName), +#ifdef Q_WS_X11 + display(0L), + argb_visual(false), +#endif + d (new TDEApplicationPrivate()) +{ + aIconPixmap.pm.icon = 0L; + aIconPixmap.pm.miniIcon = 0L; + read_app_startup_id(); + if (!GUIenabled) + allowStyles = false; + useStyles = allowStyles; + Q_ASSERT (!rAppName.isEmpty()); + setName(rAppName); + + installSigpipeHandler(); + TDECmdLineArgs::initIgnore(argc, argv, rAppName.data()); + parseCommandLine( ); + init(GUIenabled); + d->m_KAppDCOPInterface = new KAppDCOPInterface(this); +} + +// FIXME +// FOR BINARY COMPATIBILITY ONLY +// REMOVE WHEN PRACTICAL! TDEApplication::TDEApplication( int& argc, char** argv, const TQCString& rAppName, bool allowStyles, bool GUIenabled ) : TQApplication( argc, argv, GUIenabled ), TDEInstance(rAppName), diff --git a/tdecore/tdeapplication.h b/tdecore/tdeapplication.h index 5ab8d7ee7..f58bfe0c7 100644 --- a/tdecore/tdeapplication.h +++ b/tdecore/tdeapplication.h @@ -257,8 +257,16 @@ public: */ // REMOVE FOR KDE 4.0 - using it only gives crashing applications because // TDECmdLineArgs::init isn't called - TDEApplication(int& argc, char** argv, - const TQCString& rAppName, bool allowStyles=true, bool GUIenabled=true) KDE_DEPRECATED; + TDEApplication(int& argc, char** argv, + const TQCString& rAppName, bool allowStyles=true, bool GUIenabled=true, bool SMenabled=true) KDE_DEPRECATED; + +#ifdef TDEAPPLICATION_BINARY_COMPAT_HACK + // FIXME + // FOR BINARY COMPATIBILITY ONLY + // REMOVE WHEN PRACTICAL! + TDEApplication(int& argc, char** argv, + const TQCString& rAppName, bool allowStyles, bool GUIenabled) KDE_DEPRECATED; +#endif // TDEAPPLICATION_BINARY_COMPAT_HACK /** * Add Qt and KDE command line options to TDECmdLineArgs. From c8d64e3c7b8b6da34c3aa9acc2fbac750e122786 Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Wed, 7 Aug 2013 19:20:15 -0500 Subject: [PATCH 10/13] Fix FTBFS on tdehardwaredevices.cpp with some combinations of options. This resolves bug report 1594. --- tdecore/CMakeLists.txt | 27 +++++++++++++-------------- tdecore/tdehardwaredevices.cpp | 2 +- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt index a201774f8..a186c1376 100644 --- a/tdecore/CMakeLists.txt +++ b/tdecore/CMakeLists.txt @@ -19,14 +19,15 @@ if( NOT DBUS_SYSTEM_BUS ) set( DBUS_SYSTEM_BUS "unix:path=/var/run/dbus/system_bus_socket" CACHE INTERNAL "" FORCE ) endif() +if( WITH_UPOWER OR WITH_UDISKS OR WITH_UDISKS2 OR + WITH_NETWORK_MANAGER_BACKEND OR WITH_CONSOLEKIT ) + list( APPEND TDEHW_CUSTOM_INCLUDE_DIRS ${DBUS_TQT_INCLUDE_DIRS} ) + list( APPEND TDEHW_CUSTOM_LIBRARY_DIRS ${DBUS_TQT_LIBRARY_DIRS} ) + list( APPEND TDEHW_CUSTOM_LIBRARIES ${DBUS_TQT_LIBRARIES} ) +endif( ) + if( WITH_UPOWER ) add_definitions( -DWITH_UPOWER ) - set ( TDEUPOWER_INCLUDE_DIRECTORIES - ${DBUS_TQT_INCLUDE_DIRS} - ) - set ( TDEUPOWER_LIBRARIES - ${DBUS_TQT_LIBRARIES} - ) endif( ) if( WITH_UDISKS ) @@ -48,14 +49,12 @@ endif( WITH_LIBART ) if( WITH_NETWORK_MANAGER_BACKEND ) add_subdirectory( networkbackends/network-manager/dbus ) - set ( TDENM_INCLUDE_DIRECTORIES - ${DBUS_TQT_INCLUDE_DIRS} + list( APPEND TDEHW_CUSTOM_INCLUDE_DIRS ${NM_UTIL_INCLUDE_DIRS} - "${CMAKE_BINARY_DIR}/tdecore/networkbackends/network-manager/dbus" + "${CMAKE_CURRENT_BINARY_DIR}/networkbackends/network-manager/dbus" ) - set ( TDENM_LIBRARIES + list( APPEND TDEHW_CUSTOM_LIBRARIES tdenm_dbus-static - ${DBUS_TQT_LIBRARIES} ) set ( TDENM_BACKEND_SOURCES networkbackends/network-manager/network-manager.cpp ) endif( WITH_NETWORK_MANAGER_BACKEND ) @@ -75,8 +74,7 @@ include_directories( ${LIBART_INCLUDE_DIRS} ${LIBIDN_INCLUDE_DIRS} ${GAMIN_INCLUDEDIR} - ${TDENM_INCLUDE_DIRECTORIES} - ${TDEUPOWER_INCLUDE_DIRECTORIES} + ${TDEHW_CUSTOM_INCLUDE_DIRS} ) link_directories( @@ -84,6 +82,7 @@ link_directories( ${LIBIDN_LIBRARY_DIRS} ${GAMIN_LIBDIR} ${LIBART_LIBRARY_DIRS} + ${TDEHW_CUSTOM_LIBRARY_DIRS} ) ##### headers ################################### @@ -178,7 +177,7 @@ tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 4.2.0 EMBED tdecorenetwork-static - LINK ltdlc-static ${KDESVGICONS} DCOP-shared tdefx-shared ${ZLIB_LIBRARIES} ${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM udev ${GAMIN_LIBRARIES} ${TDENM_LIBRARIES} ${TDEUPOWER_LIBRARIES} + LINK ltdlc-static ${KDESVGICONS} DCOP-shared tdefx-shared ${ZLIB_LIBRARIES} ${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM udev ${GAMIN_LIBRARIES} ${TDEHW_CUSTOM_LIBRARIES} DEPENDENCIES dcopidl dcopidl2cpp DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/tdecore/tdehardwaredevices.cpp b/tdecore/tdehardwaredevices.cpp index f75df6e87..bc56f8430 100644 --- a/tdecore/tdehardwaredevices.cpp +++ b/tdecore/tdehardwaredevices.cpp @@ -70,7 +70,7 @@ extern "C" { #endif // WITH_NETWORK_MANAGER_BACKEND // uPower and uDisks2 integration -#if defined(WITH_UPOWER) || defined(WITH_UDISKS) || defined(WITH_UDISKS2) +#if defined(WITH_UPOWER) || defined(WITH_UDISKS) || defined(WITH_UDISKS2) || defined(WITH_CONSOLEKIT) #include #include #include From 1f3ee12a9a3fc09f69f45201c857a02b7abb127c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 8 Aug 2013 14:33:33 -0500 Subject: [PATCH 11/13] Change mount API to allow for mount backends other than pmount Add static convenience method for determining X11 VT mapping to TDEApplication --- tdecore/tdeapplication.cpp | 81 ++++++++++++++++++++++++++++++++++ tdecore/tdeapplication.h | 7 +++ tdecore/tdehardwaredevices.cpp | 60 ++++++++++++++++++++++--- tdecore/tdehardwaredevices.h | 6 ++- 4 files changed, 147 insertions(+), 7 deletions(-) diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp index 857c157e8..9a5bd7a0b 100644 --- a/tdecore/tdeapplication.cpp +++ b/tdecore/tdeapplication.cpp @@ -175,6 +175,14 @@ typedef void* IceIOErrorHandler; #include #endif +#if defined Q_WS_X11 +#include +#include +extern "C" { +extern int getfd(const char *fnam); +} +#endif + #include "kappdcopiface.h" // exported for tdm kfrontend @@ -242,6 +250,67 @@ void TDEApplication_init_windows(bool GUIenabled); class QAssistantClient; #endif +#ifdef Q_WS_X11 +// -------------------------------------------------------------------------------------- +// Get the VT number X is running on +// (code taken from GDM, daemon/getvt.c, GPLv2+) +// -------------------------------------------------------------------------------------- +int get_x_vtnum(Display *dpy) +{ + Atom prop; + Atom actualtype; + int actualformat; + unsigned long nitems; + unsigned long bytes_after; + unsigned char *buf; + int num; + + prop = XInternAtom (dpy, "XFree86_VT", False); + if (prop == None) + return -1; + + if (XGetWindowProperty (dpy, DefaultRootWindow (dpy), prop, 0, 1, + False, AnyPropertyType, &actualtype, &actualformat, + &nitems, &bytes_after, &buf)) { + return -1; + } + + if (nitems != 1) { + XFree (buf); + return -1; + } + + switch (actualtype) { + case XA_CARDINAL: + case XA_INTEGER: + case XA_WINDOW: + switch (actualformat) { + case 8: + num = (*(uint8_t *)(void *)buf); + break; + case 16: + num = (*(uint16_t *)(void *)buf); + break; + case 32: + num = (*(uint32_t *)(void *)buf); + break; + default: + XFree (buf); + return -1; + } + break; + default: + XFree (buf); + return -1; + } + + XFree (buf); + + return num; +} +// -------------------------------------------------------------------------------------- +#endif // Q_WS_X11 + /* Private data to make keeping binary compatibility easier */ @@ -3632,6 +3701,18 @@ TQ_ButtonState TDEApplication::keyboardMouseState() return static_cast< ButtonState >( ret ); } +#if defined Q_WS_X11 +int TDEApplication::currentX11VT() +{ + return get_x_vtnum(TQPaintDevice::x11AppDisplay()); +} +#else // Q_WS_X11 +int TDEApplication::currentX11VT() +{ + return -1; +} +#endif // Q_WS_X11 + void TDEApplication::installSigpipeHandler() { #ifdef Q_OS_UNIX diff --git a/tdecore/tdeapplication.h b/tdecore/tdeapplication.h index f58bfe0c7..089f9f940 100644 --- a/tdecore/tdeapplication.h +++ b/tdecore/tdeapplication.h @@ -1220,6 +1220,13 @@ public: */ static uint mouseState() KDE_DEPRECATED; + /** + * Returns the VT that the current X server is running on, or -1 if this information is unavailable. + * + * @since 14.0.0 + */ + static int currentX11VT(); + public slots: /** diff --git a/tdecore/tdehardwaredevices.cpp b/tdecore/tdehardwaredevices.cpp index bc56f8430..7fa9f3ad8 100644 --- a/tdecore/tdehardwaredevices.cpp +++ b/tdecore/tdehardwaredevices.cpp @@ -937,7 +937,7 @@ TQString TDEStorageDevice::mountPath() { file.close(); } - // While this device is not directly mounted, it could concievably be mounted via the Device Mapper + // While this device is not directly mounted, it could conceivably be mounted via the Device Mapper // If so, try to retrieve the mount path... TQStringList slaveDeviceList = holdingDevices(); for ( TQStringList::Iterator slavedevit = slaveDeviceList.begin(); slavedevit != slaveDeviceList.end(); ++slavedevit ) { @@ -953,7 +953,7 @@ TQString TDEStorageDevice::mountPath() { return TQString::null; } -TQString TDEStorageDevice::mountDevice(TQString mediaName, TQString mountOptions, TQString* errRet, int* retcode) { +TQString TDEStorageDevice::mountDevice(TQString mediaName, TDEStorageMountOptions mountOptions, TQString* errRet, int* retcode) { int internal_retcode; if (!retcode) { retcode = &internal_retcode; @@ -969,12 +969,37 @@ TQString TDEStorageDevice::mountDevice(TQString mediaName, TQString mountOptions KTempFile passwordFile(TQString::null, "tmp", 0600); passwordFile.setAutoDelete(true); + TQString optionString; + if (mountOptions["ro"] == "true") { + optionString.append(" -r"); + } + + if (mountOptions["atime"] != "true") { + optionString.append(" -A"); + } + + if (mountOptions["utf8"] == "true") { + optionString.append(" -c utf8"); + } + + if (mountOptions["sync"] == "true") { + optionString.append(" -s"); + } + + if (mountOptions.contains("filesystem")) { + optionString.append(TQString(" -t %1").arg(mountOptions["filesystem"])); + } + + if (mountOptions.contains("locale")) { + optionString.append(TQString(" -c %1").arg(mountOptions["locale"])); + } + TQString passFileName = passwordFile.name(); TQString devNode = deviceNode(); passFileName.replace("'", "'\\''"); devNode.replace("'", "'\\''"); mediaName.replace("'", "'\\''"); - TQString command = TQString("pmount -p '%1' %2 '%3' '%4' 2>&1").arg(passFileName).arg(mountOptions).arg(devNode).arg(mediaName); + TQString command = TQString("pmount -p '%1' %2 '%3' '%4' 2>&1").arg(passFileName).arg(optionString).arg(devNode).arg(mediaName); FILE *exepipe = popen(command.ascii(), "r"); if (exepipe) { @@ -995,7 +1020,7 @@ TQString TDEStorageDevice::mountDevice(TQString mediaName, TQString mountOptions return ret; } -TQString TDEStorageDevice::mountEncryptedDevice(TQString passphrase, TQString mediaName, TQString mountOptions, TQString* errRet, int* retcode) { +TQString TDEStorageDevice::mountEncryptedDevice(TQString passphrase, TQString mediaName, TDEStorageMountOptions mountOptions, TQString* errRet, int* retcode) { int internal_retcode; if (!retcode) { retcode = &internal_retcode; @@ -1018,12 +1043,37 @@ TQString TDEStorageDevice::mountEncryptedDevice(TQString passphrase, TQString me pwFile->writeBlock(passphrase.ascii(), passphrase.length()); pwFile->flush(); + TQString optionString; + if (mountOptions["ro"] == "true") { + optionString.append(" -r"); + } + + if (mountOptions["atime"] != "true") { + optionString.append(" -A"); + } + + if (mountOptions["utf8"] == "true") { + optionString.append(" -c utf8"); + } + + if (mountOptions["sync"] == "true") { + optionString.append(" -s"); + } + + if (mountOptions.contains("filesystem")) { + optionString.append(TQString(" -t %1").arg(mountOptions["filesystem"])); + } + + if (mountOptions.contains("locale")) { + optionString.append(TQString(" -c %1").arg(mountOptions["locale"])); + } + TQString passFileName = passwordFile.name(); TQString devNode = deviceNode(); passFileName.replace("'", "'\\''"); devNode.replace("'", "'\\''"); mediaName.replace("'", "'\\''"); - TQString command = TQString("pmount -p '%1' %2 '%3' '%4' 2>&1").arg(passFileName).arg(mountOptions).arg(devNode).arg(mediaName); + TQString command = TQString("pmount -p '%1' %2 '%3' '%4' 2>&1").arg(passFileName).arg(optionString).arg(devNode).arg(mediaName); FILE *exepipe = popen(command.ascii(), "r"); if (exepipe) { diff --git a/tdecore/tdehardwaredevices.h b/tdecore/tdehardwaredevices.h index e7a7a3e26..531406dc5 100644 --- a/tdecore/tdehardwaredevices.h +++ b/tdecore/tdehardwaredevices.h @@ -513,6 +513,8 @@ class TDECORE_EXPORT TDEGenericDevice : public TQObject friend class TDEHardwareDevices; }; +typedef TQMap TDEStorageMountOptions; + class TDECORE_EXPORT TDEStorageDevice : public TDEGenericDevice { public: @@ -582,7 +584,7 @@ class TDECORE_EXPORT TDEStorageDevice : public TDEGenericDevice * * @return a TQString with the mount path, if successful */ - TQString mountDevice(TQString mediaName=TQString::null, TQString mountOptions=TQString::null, TQString* errRet=0, int* retcode=0); + TQString mountDevice(TQString mediaName=TQString::null, TDEStorageMountOptions mountOptions=TDEStorageMountOptions(), TQString* errRet=0, int* retcode=0); /** * Mounts the encrypted device if the correct passphrase is given @@ -595,7 +597,7 @@ class TDECORE_EXPORT TDEStorageDevice : public TDEGenericDevice * * @return a TQString with the mount path, if successful */ - TQString mountEncryptedDevice(TQString passphrase, TQString mediaName=TQString::null, TQString mountOptions=TQString::null, TQString* errRet=0, int* retcode=0); + TQString mountEncryptedDevice(TQString passphrase, TQString mediaName=TQString::null, TDEStorageMountOptions mountOptions=TDEStorageMountOptions(), TQString* errRet=0, int* retcode=0); /** * Unmounts the device From 7cc3a975d2b1ac2d9efa6abef037533fc8bfec7c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 8 Aug 2013 14:52:20 -0500 Subject: [PATCH 12/13] Allow session manager to be disable on creation when argc and argv are not passed to TDEApplication This relates to Bug 760 --- tdecore/tdeapplication.cpp | 27 +++++++++++++++++++++++++++ tdecore/tdeapplication.h | 7 +++++++ 2 files changed, 34 insertions(+) diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp index 9a5bd7a0b..34bd8aadd 100644 --- a/tdecore/tdeapplication.cpp +++ b/tdecore/tdeapplication.cpp @@ -750,6 +750,33 @@ TDEApplication::TDEApplication( int& argc, char** argv, const TQCString& rAppNam d->m_KAppDCOPInterface = new KAppDCOPInterface(this); } +TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled, bool SMenabled ) : +// TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), TRUE ), // Qt4 requires that there always be a GUI + TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), GUIenabled, SMenabled ), // We need to be able to run command line apps + TDEInstance( TDECmdLineArgs::about), +#ifdef Q_WS_X11 + display(0L), + argb_visual(false), +#endif + d (new TDEApplicationPrivate) +{ + aIconPixmap.pm.icon = 0L; + aIconPixmap.pm.miniIcon = 0L; + read_app_startup_id(); + if (!GUIenabled) + allowStyles = false; + useStyles = allowStyles; + setName( instanceName() ); + + installSigpipeHandler(); + parseCommandLine( ); + init(GUIenabled); + d->m_KAppDCOPInterface = new KAppDCOPInterface(this); +} + +// FIXME +// FOR BINARY COMPATIBILITY ONLY +// REMOVE WHEN PRACTICAL! TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled ) : // TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), TRUE ), // Qt4 requires that there always be a GUI TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), GUIenabled ), // We need to be able to run command line apps diff --git a/tdecore/tdeapplication.h b/tdecore/tdeapplication.h index 089f9f940..c22e9edbb 100644 --- a/tdecore/tdeapplication.h +++ b/tdecore/tdeapplication.h @@ -128,7 +128,14 @@ public: * @param GUIenabled Set to false to disable all GUI stuff. This implies * no styles either. */ + TDEApplication( bool allowStyles=true, bool GUIenabled=true, bool SMenabled=true); + +#ifdef TDEAPPLICATION_BINARY_COMPAT_HACK + // FIXME + // FOR BINARY COMPATIBILITY ONLY + // REMOVE WHEN PRACTICAL! TDEApplication( bool allowStyles=true, bool GUIenabled=true); +#endif // TDEAPPLICATION_BINARY_COMPAT_HACK #ifdef Q_WS_X11 /** From 411486cc50448e91b53d28119ccec54c5c2305cd Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 8 Aug 2013 15:04:32 -0500 Subject: [PATCH 13/13] Disable session management in tdeio slaves This relates to Bug 760 --- tdeioslave/metainfo/metainfo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tdeioslave/metainfo/metainfo.cpp b/tdeioslave/metainfo/metainfo.cpp index 389a9182e..37f50a132 100644 --- a/tdeioslave/metainfo/metainfo.cpp +++ b/tdeioslave/metainfo/metainfo.cpp @@ -42,7 +42,7 @@ extern "C" int kdemain(int argc, char **argv) { - TDEApplication app(argc, argv, "tdeio_metainfo", false, true); + TDEApplication app(argc, argv, "tdeio_metainfo", false, true, false); if (argc != 4) {