François Andriot
11 years ago
parent
6f4cd26a02
commit
0f108a5d0a
@ -0,0 +1,14 @@
|
|||||||
|
--- trinity-k9copy-3.5.13.2/k9author/k9avidecode.h.ORI 2013-07-29 21:52:57.859615464 +0200
|
||||||
|
+++ trinity-k9copy-3.5.13.2/k9author/k9avidecode.h 2013-07-29 21:57:19.206481299 +0200
|
||||||
|
@@ -43,7 +43,11 @@
|
||||||
|
#else
|
||||||
|
typedef int (*av_find_stream_info_t)(AVFormatContext *);
|
||||||
|
#endif
|
||||||
|
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 26, 0)
|
||||||
|
+typedef AVCodec* (*avcodec_find_decoder_t)(enum AVCodecID);
|
||||||
|
+#else
|
||||||
|
typedef AVCodec* (*avcodec_find_decoder_t)(enum CodecID);
|
||||||
|
+#endif
|
||||||
|
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)
|
||||||
|
typedef int (*avcodec_open2_t)(AVCodecContext *, AVCodec *, AVDictionary **);
|
||||||
|
#else
|
||||||
@ -0,0 +1,18 @@
|
|||||||
|
--- trinity-k9copy-3.5.13.2/k9decmpeg/mpeg2_internal.h.ORI 2013-07-28 19:42:30.331485057 +0200
|
||||||
|
+++ trinity-k9copy-3.5.13.2/k9decmpeg/mpeg2_internal.h 2013-07-28 19:43:09.713519110 +0200
|
||||||
|
@@ -21,6 +21,9 @@
|
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
*/
|
||||||
|
|
||||||
|
+#ifndef __MPEG2_INTERNAL_H__
|
||||||
|
+#define __MPEG2_INTERNAL_H__
|
||||||
|
+
|
||||||
|
/* macroblock modes */
|
||||||
|
#define MACROBLOCK_INTRA 1
|
||||||
|
#define MACROBLOCK_PATTERN 2
|
||||||
|
@@ -298,3 +301,5 @@
|
||||||
|
extern mpeg2_mc_t mpeg2_mc_altivec;
|
||||||
|
extern mpeg2_mc_t mpeg2_mc_alpha;
|
||||||
|
extern mpeg2_mc_t mpeg2_mc_vis;
|
||||||
|
+
|
||||||
|
+#endif // __MPEG2_INTERNAL_H__
|
||||||
@ -0,0 +1,102 @@
|
|||||||
|
--- ./k9author/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200
|
||||||
|
+++ ./k9author/Makefile.am 2013-07-28 20:05:20.857621477 +0200
|
||||||
|
@@ -14,5 +14,5 @@
|
||||||
|
k9import.h k9importfiles.h k9lvitemimport.h k9menu.h k9menubutton.h k9menuedit.h \
|
||||||
|
k9menueditor.h k9newdvd.h k9newtitle.h k9title.h
|
||||||
|
libk9author_la_LIBADD = $(top_builddir)/libk9copy/libk9copy.la $(LIB_KDEUI)
|
||||||
|
-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9devices \
|
||||||
|
+INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9devices \
|
||||||
|
-I$(top_srcdir)/k9vamps -I$(top_srcdir)/libk9copy -I$(top_srcdir)/src $(all_includes)
|
||||||
|
--- ./k9decmpeg/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200
|
||||||
|
+++ ./k9decmpeg/Makefile.am 2013-07-28 20:05:20.857621477 +0200
|
||||||
|
@@ -12,7 +12,7 @@
|
||||||
|
motion_comp_altivec.cpp motion_comp.cpp motion_comp_mmx.cpp motion_comp_vis.cpp mpeg2convert.h \
|
||||||
|
mpeg2.h mpeg2_internal.h rgb.cpp rgb_mmx.cpp rgb_vis.cpp slice.cpp tendra.h \
|
||||||
|
uyvy.cpp video_out.h vis.h vlc.h k9decodethread.cpp k9plaympeg2.cpp
|
||||||
|
-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9vamps \
|
||||||
|
+INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9vamps \
|
||||||
|
-I$(top_srcdir)/libdvdnav -I$(top_srcdir)/libk9copy
|
||||||
|
|
||||||
|
noinst_HEADERS = k9decodethread.h k9plaympeg2.h
|
||||||
|
--- ./k9devices/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200
|
||||||
|
+++ ./k9devices/Makefile.am 2013-07-28 20:05:20.857621477 +0200
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/libk9copy $(DBUS_INCS) \
|
||||||
|
+INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/libk9copy $(DBUS_INCS) \
|
||||||
|
$(HAL_INCS) $(K3B_INCS) $(all_includes)
|
||||||
|
METASOURCES = AUTO
|
||||||
|
libk9devices_la_LDFLAGS = $(all_libraries)
|
||||||
|
--- ./k9Mplayer/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200
|
||||||
|
+++ ./k9Mplayer/Makefile.am 2013-07-28 20:05:20.857621477 +0200
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/libk9copy $(all_includes)
|
||||||
|
+INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/libk9copy $(all_includes)
|
||||||
|
METASOURCES = AUTO
|
||||||
|
|
||||||
|
noinst_LTLIBRARIES = libk9mplayer.la
|
||||||
|
--- ./k9vamps/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200
|
||||||
|
+++ ./k9vamps/Makefile.am 2013-07-28 20:05:20.858621351 +0200
|
||||||
|
@@ -7,6 +7,6 @@
|
||||||
|
noinst_LTLIBRARIES = libk9vamps.la
|
||||||
|
libk9vamps_la_SOURCES = cputest.cpp getvlc.h k9fifo.cpp k9requant.cpp \
|
||||||
|
k9vamps.cpp k9vamps.h putvlc.h qTable.h tcmemcpy.cpp
|
||||||
|
-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9vamps \
|
||||||
|
+INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9vamps \
|
||||||
|
-I$(top_srcdir)/libk9copy
|
||||||
|
noinst_HEADERS = k9requant.h ac.h k9fifo.h
|
||||||
|
--- ./libdvdnav/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200
|
||||||
|
+++ ./libdvdnav/Makefile.am 2013-07-28 20:05:20.858621351 +0200
|
||||||
|
@@ -11,4 +11,4 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
-INCLUDES = -I$(top_srcdir)/dvdread
|
||||||
|
+INCLUDES = -I/usr/include/dvdread
|
||||||
|
--- ./libk9copy/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200
|
||||||
|
+++ ./libk9copy/Makefile.am 2013-07-28 20:05:20.858621351 +0200
|
||||||
|
@@ -24,6 +24,6 @@
|
||||||
|
k9saveimage.h k9script.h k9titleencopt.h k9tools.h k9videocodecs.h
|
||||||
|
|
||||||
|
|
||||||
|
-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9decmpeg \
|
||||||
|
+INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9decmpeg \
|
||||||
|
-I$(top_srcdir)/k9vamps -I$(top_srcdir)/libdvdnav
|
||||||
|
libk9copy_la_LDFLAGS = $(all_libraries)
|
||||||
|
--- ./src/Makefile.am.dvdread 2013-07-28 20:05:20.855621729 +0200
|
||||||
|
+++ ./src/Makefile.am 2013-07-28 20:09:10.620642017 +0200
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
# set the include path for X, qt and KDE
|
||||||
|
-INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9Mplayer \
|
||||||
|
+INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9Mplayer \
|
||||||
|
-I$(top_srcdir)/k9author -I$(top_srcdir)/k9decmpeg -I$(top_srcdir)/k9devices \
|
||||||
|
-I$(top_srcdir)/k9vamps -I$(top_srcdir)/libdvdnav -I$(top_srcdir)/libk9copy $(all_includes)
|
||||||
|
|
||||||
|
@@ -35,7 +35,7 @@
|
||||||
|
$(top_builddir)/k9author/libk9author.la $(top_builddir)/k9decmpeg/libk9decmpeg.la \
|
||||||
|
$(top_builddir)/k9devices/libk9devices.la $(top_builddir)/k9vamps/libk9vamps.la \
|
||||||
|
$(top_builddir)/libdvdnav/libk9dvdnav.la $(top_builddir)/libk9copy/libk9copy.la \
|
||||||
|
- $(top_builddir)/dvdread/libdvdread.la $(LIB_KDEUI) -lkmdi $(LIBDL) -lk3b -lk3bdevice
|
||||||
|
+ -ldvdread $(LIB_KDEUI) -lkmdi $(LIBDL) -lk3b -lk3bdevice
|
||||||
|
|
||||||
|
# this is where the desktop file will go
|
||||||
|
shelldesktopdir = $(kde_appsdir)/Utilities
|
||||||
|
--- ./Makefile.am.ORI 2013-07-28 20:15:29.961786846 +0200
|
||||||
|
+++ ./Makefile.am 2013-07-28 20:15:43.375094511 +0200
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
-SUBDIRS = doc dvdread libdvdnav k9Mplayer libk9copy k9author k9decmpeg k9devices k9vamps \
|
||||||
|
+SUBDIRS = doc libdvdnav k9Mplayer libk9copy k9author k9decmpeg k9devices k9vamps \
|
||||||
|
po src
|
||||||
|
|
||||||
|
$(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs
|
||||||
|
@@ -29,11 +29,3 @@
|
||||||
|
|
||||||
|
AM_CXXFLAGS = -O0 -g3
|
||||||
|
|
||||||
|
-
|
||||||
|
-
|
||||||
|
-
|
||||||
|
-
|
||||||
|
-
|
||||||
|
-
|
||||||
|
-
|
||||||
|
-INCLUDES = -I$(top_srcdir)/dvdread
|
||||||
@ -0,0 +1,19 @@
|
|||||||
|
--- ./kmymoney2/widgets/Makefile.am.ftbfs 2013-06-06 19:37:02.000000000 +0200
|
||||||
|
+++ ./kmymoney2/widgets/Makefile.am 2013-07-28 18:58:51.406093917 +0200
|
||||||
|
@@ -7,14 +7,14 @@
|
||||||
|
libwidgets_a_METASOURCES = AUTO
|
||||||
|
|
||||||
|
libwidgets_a_SOURCES = kbudgetvalues.cpp kbudgetvaluesdecl.ui kguiutils.cpp klistviewsearchline.cpp kmymoneyaccountcombo.cpp kmymoneyaccountcompletion.cpp kmymoneyaccountselector.cpp kmymoneyaccounttreebase.cpp kmymoneyaccounttree.cpp kmymoneyaccounttreebudget.cpp kmymoneyaccounttreeforecast.cpp kmymoneybriefschedule.cpp kmymoneycalculator.cpp kmymoneycalendar.cpp kmymoneycategory.cpp kmymoneychecklistitem.cpp kmymoneycombo.cpp kmymoneycompletion.cpp kmymoneycurrencyselector.cpp kmymoneydateinput.cpp kmymoneydatetbl.cpp kmymoneyedit.cpp kmymoneyforecastlistviewitem.cpp kmymoneygpgconfig.cpp kmymoneygpgconfigdecl.ui kmymoneylineedit.cpp kmymoneylistviewitem.cpp kmymoneyonlinequoteconfig.cpp kmymoneyonlinequoteconfigdecl.ui kmymoneypriceview.cpp kmymoneyreportconfigtab1decl.ui kmymoneyreportconfigtab2decl.ui kmymoneyreportconfigtab3decl.ui kmymoneyreportconfigtabchartdecl.ui kmymoneyreportcontroldecl.ui kmymoneyscheduledcalendar.cpp kmymoneyscheduleddatetbl.cpp kmymoneyselector.cpp kmymoneytitlelabel.cpp kmymoneywizard.cpp kschedulebriefwidget.ui register.cpp registeritem.cpp registersearchline.cpp transaction.cpp scheduledtransaction.cpp stdtransactiondownloaded.cpp stdtransactionmatched.cpp transactioneditorcontainer.cpp transactionform.cpp kaccounttemplateselectordecl.ui kaccounttemplateselector.cpp \
|
||||||
|
-transactionsortoption.cpp transactionsortoption.ui \
|
||||||
|
+transactionsortoption.ui \
|
||||||
|
selectedtransaction.cpp
|
||||||
|
|
||||||
|
#libwidgets_a_SOURCES = kmymoneyregisterinvestment.cpp kmymoneyequity.cpp kmymoneyequitycompletion.cpp kmymoneycompletion.cpp kmymoneyequityselector.cpp kmymoneyaccountcombo.cpp kmymoneyaccountcompletion.cpp kmymoneycurrencyselector.cpp kmymoneypriceview.cpp kmymoneypriceviewdecl.ui kschedulebriefwidget.ui kmymoneyaccountselector.cpp kmymoneyregisterloan.cpp kmymoneyregistersearch.cpp kmymoneybriefschedule.cpp kmymoneyscheduleddatetbl.cpp kmymoneydatetbl.cpp kmymoneyscheduledcalendar.cpp kmymoneycalendar.cpp kmymoneycalculator.cpp kmymoneycategory.cpp kmymoneypayee.cpp kmymoneytransactionform.cpp kmymoneyregistercheckings.cpp kmymoneyregister.cpp kmymoneycombo.cpp kmymoneyhlayout.cpp kmymoneylineedit.cpp kmymoneyedit.cpp kmymoneydateinput.cpp kmymoneyreportcontroldecl.ui kmymoneyreportconfigtab1decl.ui kmymoneyreportconfigtab2decl.ui kmymoneyreportconfigtab3decl.ui kmymoneyreportconfigtabchartdecl.ui kmymoneyonlinequoteconfig.cpp kmymoneyonlinequoteconfigdecl.ui kmymoneyaccounttree.cpp kmymoneygpgconfigdecl.ui kmymoneygpgconfig.cpp kmymoneytitlelabel.cpp kguiutils.cpp kmymoneywizard.cpp kmymoneyaccounttreebudget.cpp kmymoneyaccounttreeforecast.cpp \
|
||||||
|
#register.cpp registeritem.cpp transaction.cpp transactionform.cpp transactioneditor.cpp transactioneditorcontainer.cpp kmymoneychecklistitem.cpp kmymoneylistviewitem.cpp kmymoneyforecastlistviewitem.cpp kmymoneyselector.cpp \
|
||||||
|
#transactionsortoption.ui
|
||||||
|
|
||||||
|
-EXTRA_DIST = kmymoney.widgets kmymoneygpgconfigdecl.ui kmymoneyonlinequoteconfigdecl.ui kmymoneyreportconfigtab1decl.ui kmymoneyreportconfigtab2decl.ui kmymoneyreportconfigtab3decl.ui kmymoneyreportcontroldecl.ui kschedulebriefwidget.ui kmymoneyreportconfigtabchartdecl.ui transactionsortoption.ui transactionsortoption.ui.h sortoptionlistitem.h kbudgetvaluesdecl.ui kaccounttemplateselectordecl.ui
|
||||||
|
+EXTRA_DIST = kmymoney.widgets kmymoneygpgconfigdecl.ui kmymoneyonlinequoteconfigdecl.ui kmymoneyreportconfigtab1decl.ui kmymoneyreportconfigtab2decl.ui kmymoneyreportconfigtab3decl.ui kmymoneyreportcontroldecl.ui kschedulebriefwidget.ui kmymoneyreportconfigtabchartdecl.ui transactionsortoption.ui.h sortoptionlistitem.h kbudgetvaluesdecl.ui kaccounttemplateselectordecl.ui
|
||||||
|
|
||||||
|
# include the widgets that are available to 3rd party sw (e.g. plugins or
|
||||||
|
# Qt designer) here
|
||||||
@ -0,0 +1,19 @@
|
|||||||
|
--- trinity-tellico-3.5.13.2/src/barcode/barcode.cpp.ORI 2013-07-29 17:21:06.358915613 +0200
|
||||||
|
+++ trinity-tellico-3.5.13.2/src/barcode/barcode.cpp 2013-07-29 17:22:29.505126885 +0200
|
||||||
|
@@ -172,14 +172,14 @@
|
||||||
|
for (int i = 0; i < 10; i++) {
|
||||||
|
TQCString temp;
|
||||||
|
temp.setNum( i );
|
||||||
|
- fprintf( stderr, temp + " : " );
|
||||||
|
+ fprintf( stderr, "%s : ", *(temp) );
|
||||||
|
for (int j = 0; j < 13; j++) {
|
||||||
|
if (array[i][j][level] == -1)
|
||||||
|
fprintf( stderr, "x " );
|
||||||
|
else {
|
||||||
|
TQCString temp;
|
||||||
|
temp.setNum( array[i][j][level] );
|
||||||
|
- fprintf( stderr, temp + " " );
|
||||||
|
+ fprintf( stderr, "%s ", *(temp) );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fprintf( stderr, "\n" );
|
||||||
@ -0,0 +1,11 @@
|
|||||||
|
--- trinity-tellico-3.5.13.2/src/barcode/barcode_v4l.h.ORI 2013-07-28 22:22:41.390223800 +0200
|
||||||
|
+++ trinity-tellico-3.5.13.2/src/barcode/barcode_v4l.h 2013-07-28 22:23:10.085637439 +0200
|
||||||
|
@@ -31,7 +31,7 @@
|
||||||
|
#endif
|
||||||
|
|
||||||
|
//#include <linux/videodev2.h>
|
||||||
|
-#include <linux/videodev.h>
|
||||||
|
+#include <libv4l1.h>
|
||||||
|
|
||||||
|
#include <tqstring.h>
|
||||||
|
#include <tqimage.h>
|
||||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,136 @@
|
|||||||
|
--- tdebase/kcontrol/input/xcursor/themepage.cpp.ORI 2013-07-22 19:33:45.153674930 +0200
|
||||||
|
+++ tdebase/kcontrol/input/xcursor/themepage.cpp 2013-07-23 15:24:01.664497762 +0200
|
||||||
|
@@ -33,6 +33,8 @@
|
||||||
|
#include <kio/netaccess.h>
|
||||||
|
#include <ktar.h>
|
||||||
|
|
||||||
|
+#include "../../krdb/krdb.h"
|
||||||
|
+
|
||||||
|
#include <tqlayout.h>
|
||||||
|
#include <tqdir.h>
|
||||||
|
#include <tqpixmap.h>
|
||||||
|
@@ -42,6 +44,7 @@
|
||||||
|
#include <tqpainter.h>
|
||||||
|
#include <tqfileinfo.h>
|
||||||
|
#include <tqpushbutton.h>
|
||||||
|
+#include <dcopref.h>
|
||||||
|
|
||||||
|
#include <cstdlib> // for getenv()
|
||||||
|
|
||||||
|
@@ -53,6 +56,10 @@
|
||||||
|
#include <X11/Xlib.h>
|
||||||
|
#include <X11/Xcursor/Xcursor.h>
|
||||||
|
|
||||||
|
+#ifdef HAVE_XFIXES
|
||||||
|
+# include <X11/extensions/Xfixes.h>
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
// Check for older version
|
||||||
|
#if !defined(XCURSOR_LIB_MAJOR) && defined(XCURSOR_MAJOR)
|
||||||
|
# define XCURSOR_LIB_MAJOR XCURSOR_MAJOR
|
||||||
|
@@ -133,6 +140,65 @@
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
+bool ThemePage::applyTheme(TQString theme, TQString size)
|
||||||
|
+{
|
||||||
|
+#ifdef HAVE_XCURSOR
|
||||||
|
+ if (theme.isEmpty()) {
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ // Apply the TDE cursor theme to ourselves
|
||||||
|
+ XcursorSetTheme(qt_xdisplay(), theme.latin1());
|
||||||
|
+
|
||||||
|
+ // Tell klauncher to set the XCURSOR_THEME and XCURSOR_SIZE environment
|
||||||
|
+ // variables when launching applications.
|
||||||
|
+ DCOPRef klauncher("klauncher");
|
||||||
|
+ klauncher.send("setLaunchEnv", TQCString("XCURSOR_THEME"), theme);
|
||||||
|
+ if( !size.isEmpty()) {
|
||||||
|
+ klauncher.send("setLaunchEnv", TQCString("XCURSOR_SIZE"), size);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ // Update the Xcursor X resources
|
||||||
|
+ runRdb(0);
|
||||||
|
+
|
||||||
|
+ // Apply the TDE cursor size to ourselves
|
||||||
|
+ if (!size.isEmpty()) {
|
||||||
|
+ XcursorSetDefaultSize(qt_xdisplay(), size.toUInt());
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ // Reload the standard cursors
|
||||||
|
+ TQStringList names;
|
||||||
|
+
|
||||||
|
+ // Qt cursors
|
||||||
|
+ names << "left_ptr" << "up_arrow" << "cross" << "wait"
|
||||||
|
+ << "left_ptr_watch" << "ibeam" << "size_ver" << "size_hor"
|
||||||
|
+ << "size_bdiag" << "size_fdiag" << "size_all" << "split_v"
|
||||||
|
+ << "split_h" << "pointing_hand" << "openhand"
|
||||||
|
+ << "closedhand" << "forbidden" << "whats_this" << "copy" << "move" << "link";
|
||||||
|
+
|
||||||
|
+ // X core cursors
|
||||||
|
+ names << "X_cursor" << "right_ptr" << "hand1"
|
||||||
|
+ << "hand2" << "watch" << "xterm"
|
||||||
|
+ << "crosshair" << "left_ptr_watch" << "center_ptr"
|
||||||
|
+ << "sb_h_double_arrow" << "sb_v_double_arrow" << "fleur"
|
||||||
|
+ << "top_left_corner" << "top_side" << "top_right_corner"
|
||||||
|
+ << "right_side" << "bottom_right_corner" << "bottom_side"
|
||||||
|
+ << "bottom_left_corner" << "left_side" << "question_arrow"
|
||||||
|
+ << "pirate";
|
||||||
|
+
|
||||||
|
+ for (int i = 0; i < names.size(); ++i)
|
||||||
|
+ {
|
||||||
|
+ const char* name = (*(names.at(i))).ascii();
|
||||||
|
+ Cursor handle = XcursorLibraryLoadCursor(qt_xdisplay(), name);
|
||||||
|
+ XFixesChangeCursorByName(qt_xdisplay(), handle, TQFile::encodeName(name));
|
||||||
|
+ XFreeCursor(qt_xdisplay(), handle); // Don't leak the cursor
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return true;
|
||||||
|
+#else // HAVE_XCURSOR
|
||||||
|
+ return false;
|
||||||
|
+#endif
|
||||||
|
+}
|
||||||
|
|
||||||
|
void ThemePage::save()
|
||||||
|
{
|
||||||
|
@@ -145,10 +209,17 @@
|
||||||
|
c.setGroup( "Mouse" );
|
||||||
|
c.writeEntry( "cursorTheme", selectedTheme != "system" ? selectedTheme : TQString::null );
|
||||||
|
|
||||||
|
- KMessageBox::information( this, i18n("You have to restart KDE for these "
|
||||||
|
+ // The Kcontrol panel does not allow to set cursor size for now.
|
||||||
|
+ // So we keep the same size as written in config file.
|
||||||
|
+ TQCString size = c.readEntry("cursorSize", TQString()).local8Bit();
|
||||||
|
+
|
||||||
|
+ if (!applyTheme(selectedTheme, size))
|
||||||
|
+ {
|
||||||
|
+ KMessageBox::information( this, i18n("You have to restart KDE for these "
|
||||||
|
"changes to take effect."), i18n("Cursor Settings Changed"),
|
||||||
|
"CursorSettingsChanged" );
|
||||||
|
-
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
currentTheme = selectedTheme;
|
||||||
|
}
|
||||||
|
|
||||||
|
--- tdebase/kcontrol/input/xcursor/themepage.h.ORI 2013-07-22 19:49:33.467191658 +0200
|
||||||
|
+++ tdebase/kcontrol/input/xcursor/themepage.h 2013-07-22 19:56:03.990484896 +0200
|
||||||
|
@@ -45,6 +45,7 @@
|
||||||
|
void load();
|
||||||
|
void load( bool useDefaults );
|
||||||
|
void defaults();
|
||||||
|
+ bool applyTheme(TQString theme, TQString size);
|
||||||
|
|
||||||
|
signals:
|
||||||
|
void changed( bool );
|
||||||
|
--- tdebase/kcontrol/input/xcursor/CMakeLists.txt.ORI 2013-07-23 15:24:41.178064068 +0200
|
||||||
|
+++ tdebase/kcontrol/input/xcursor/CMakeLists.txt 2013-07-23 15:27:31.694851294 +0200
|
||||||
|
@@ -21,5 +21,6 @@
|
||||||
|
|
||||||
|
tde_add_library( themepage STATIC_PIC AUTOMOC
|
||||||
|
SOURCES
|
||||||
|
- themepage.cpp previewwidget.cpp
|
||||||
|
+ themepage.cpp previewwidget.cpp ../../krdb/krdb.cpp
|
||||||
|
+ LINK Xfixes
|
||||||
|
)
|
||||||
@ -0,0 +1,976 @@
|
|||||||
|
diff -Nuar trinity-tdelibs-3.5.13.2/kded.ORI/applications.menu trinity-tdelibs-3.5.13.2/kded/applications.menu
|
||||||
|
--- trinity-tdelibs-3.5.13.2/kded.ORI/applications.menu 2013-07-28 15:03:29.861478619 +0200
|
||||||
|
+++ trinity-tdelibs-3.5.13.2/kded/applications.menu 1970-01-01 01:00:00.000000000 +0100
|
||||||
|
@@ -1,472 +0,0 @@
|
||||||
|
-<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
|
||||||
|
- "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
|
||||||
|
-
|
||||||
|
-<Menu>
|
||||||
|
- <Name>Applications</Name>
|
||||||
|
- <Directory>kde-main.directory</Directory>
|
||||||
|
- <!-- Search the default locations -->
|
||||||
|
- <KDELegacyDirs/>
|
||||||
|
- <DefaultAppDirs/>
|
||||||
|
- <DefaultDirectoryDirs/>
|
||||||
|
- <DefaultLayout>
|
||||||
|
- <Merge type="menus"/>
|
||||||
|
- <Merge type="files"/>
|
||||||
|
- <Separator/>
|
||||||
|
- <Menuname>More</Menuname>
|
||||||
|
- </DefaultLayout>
|
||||||
|
- <Layout>
|
||||||
|
- <Merge type="menus"/>
|
||||||
|
- <Menuname>Applications</Menuname>
|
||||||
|
- <Merge type="files"/>
|
||||||
|
- </Layout>
|
||||||
|
-
|
||||||
|
- <Menu>
|
||||||
|
- <Name>Applications</Name>
|
||||||
|
- <Directory>kde-unknown.directory</Directory>
|
||||||
|
- <OnlyUnallocated/>
|
||||||
|
- <Include>
|
||||||
|
- <Not>
|
||||||
|
- <!-- Don't list non-KDE core applications -->
|
||||||
|
- <And>
|
||||||
|
- <Category>Core</Category>
|
||||||
|
- <Not><Category>KDE</Category></Not>
|
||||||
|
- </And>
|
||||||
|
- <!-- Don't list SUSE's YaST in here -->
|
||||||
|
- <Category>X-SuSE-YaST</Category>
|
||||||
|
- </Not>
|
||||||
|
- </Include>
|
||||||
|
- </Menu>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>Development</Name>
|
||||||
|
- <Directory>kde-development.directory</Directory>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>X-KDE-KDevelopIDE</Name>
|
||||||
|
- <Directory>kde-development-kdevelop.directory</Directory>
|
||||||
|
- <Include>
|
||||||
|
- <And>
|
||||||
|
- <Category>Development</Category>
|
||||||
|
- <Category>X-KDE-KDevelopIDE</Category>
|
||||||
|
- </And>
|
||||||
|
- </Include>
|
||||||
|
- </Menu>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>Translation</Name>
|
||||||
|
- <Directory>kde-development-translation.directory</Directory>
|
||||||
|
- <Include>
|
||||||
|
- <And>
|
||||||
|
- <Category>Development</Category>
|
||||||
|
- <Category>Translation</Category>
|
||||||
|
- </And>
|
||||||
|
- </Include>
|
||||||
|
- </Menu>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>Web Development</Name>
|
||||||
|
- <Directory>kde-development-webdevelopment.directory</Directory>
|
||||||
|
- <Include>
|
||||||
|
- <And>
|
||||||
|
- <Category>Development</Category>
|
||||||
|
- <Category>WebDevelopment</Category>
|
||||||
|
- </And>
|
||||||
|
- </Include>
|
||||||
|
- </Menu>
|
||||||
|
- <Include>
|
||||||
|
- <And>
|
||||||
|
- <Category>Development</Category>
|
||||||
|
- <Not><Category>X-KDE-KDevelopIDE</Category></Not>
|
||||||
|
- <Not><Category>Translation</Category></Not>
|
||||||
|
- <Not><Category>WebDevelopment</Category></Not>
|
||||||
|
- </And>
|
||||||
|
- </Include>
|
||||||
|
- </Menu>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>Science</Name>
|
||||||
|
- <Directory>kde-science.directory</Directory>
|
||||||
|
- <Include>
|
||||||
|
- <And><!-- Include /any/ Science app which is not an Education app -->
|
||||||
|
- <Or>
|
||||||
|
- <Category>Astronomy</Category>
|
||||||
|
- <Category>Biology</Category>
|
||||||
|
- <Category>Chemistry</Category>
|
||||||
|
- <Category>Geology</Category>
|
||||||
|
- <Category>MedicalSoftware</Category>
|
||||||
|
- <Category>Physics</Category>
|
||||||
|
- <Category>Math</Category>
|
||||||
|
- <Category>Science</Category>
|
||||||
|
- </Or>
|
||||||
|
- <Not><Category>Education</Category></Not>
|
||||||
|
- </And>
|
||||||
|
- </Include>
|
||||||
|
- </Menu>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>Edutainment</Name>
|
||||||
|
- <Directory>kde-edutainment.directory</Directory>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>Languages</Name>
|
||||||
|
- <Directory>kde-edu-languages.directory</Directory>
|
||||||
|
- <Include>
|
||||||
|
- <And>
|
||||||
|
- <Category>Education</Category>
|
||||||
|
- <Or>
|
||||||
|
- <Category>Languages</Category>
|
||||||
|
- <Category>X-KDE-Edu-Language</Category>
|
||||||
|
- </Or>
|
||||||
|
- </And>
|
||||||
|
- </Include>
|
||||||
|
- </Menu>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>Mathematics</Name>
|
||||||
|
- <Directory>kde-edu-mathematics.directory</Directory>
|
||||||
|
- <Include>
|
||||||
|
- <And>
|
||||||
|
- <Category>Education</Category>
|
||||||
|
- <Category>Math</Category>
|
||||||
|
- </And>
|
||||||
|
- </Include>
|
||||||
|
- </Menu>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>Miscellaneous</Name>
|
||||||
|
- <Directory>kde-edu-miscellaneous.directory</Directory>
|
||||||
|
- <Include>
|
||||||
|
- <And>
|
||||||
|
- <Category>Education</Category>
|
||||||
|
- <Not>
|
||||||
|
- <Category>Languages</Category>
|
||||||
|
- <Category>X-KDE-Edu-Language</Category>
|
||||||
|
- <Category>Math</Category>
|
||||||
|
- <Category>Science</Category>
|
||||||
|
- <Category>Teaching</Category>
|
||||||
|
- <Category>X-KDE-Edu-Teaching</Category>
|
||||||
|
- </Not>
|
||||||
|
- </And>
|
||||||
|
- </Include>
|
||||||
|
- </Menu>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>Science</Name>
|
||||||
|
- <Directory>kde-edu-science.directory</Directory>
|
||||||
|
- <Include>
|
||||||
|
- <And>
|
||||||
|
- <Category>Education</Category>
|
||||||
|
- <Category>Science</Category>
|
||||||
|
- </And>
|
||||||
|
- </Include>
|
||||||
|
- </Menu>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>Tools</Name>
|
||||||
|
- <Directory>kde-edu-tools.directory</Directory>
|
||||||
|
- <Include>
|
||||||
|
- <And>
|
||||||
|
- <Category>Education</Category>
|
||||||
|
- <Or>
|
||||||
|
- <Category>Teaching</Category>
|
||||||
|
- <Category>X-KDE-Edu-Teaching</Category>
|
||||||
|
- </Or>
|
||||||
|
- </And>
|
||||||
|
- </Include>
|
||||||
|
- </Menu>
|
||||||
|
- </Menu>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>Games</Name>
|
||||||
|
- <Directory>kde-games.directory</Directory>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>Arcade</Name>
|
||||||
|
- <Directory>kde-games-arcade.directory</Directory>
|
||||||
|
- <Include>
|
||||||
|
- <And>
|
||||||
|
- <Category>Game</Category>
|
||||||
|
- <Category>ArcadeGame</Category>
|
||||||
|
- </And>
|
||||||
|
- </Include>
|
||||||
|
- </Menu>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>Board</Name>
|
||||||
|
- <Directory>kde-games-board.directory</Directory>
|
||||||
|
- <Include>
|
||||||
|
- <And>
|
||||||
|
- <Category>Game</Category>
|
||||||
|
- <Category>BoardGame</Category>
|
||||||
|
- </And>
|
||||||
|
- </Include>
|
||||||
|
- </Menu>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>Card</Name>
|
||||||
|
- <Directory>kde-games-card.directory</Directory>
|
||||||
|
- <Include>
|
||||||
|
- <And>
|
||||||
|
- <Category>Game</Category>
|
||||||
|
- <Category>CardGame</Category>
|
||||||
|
- </And>
|
||||||
|
- </Include>
|
||||||
|
- </Menu>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>Kidsgames</Name>
|
||||||
|
- <Directory>kde-games-kids.directory</Directory>
|
||||||
|
- <Include>
|
||||||
|
- <And>
|
||||||
|
- <Category>Game</Category>
|
||||||
|
- <Or>
|
||||||
|
- <Category>X-KDE-KidsGame</Category>
|
||||||
|
- <Category>KidsGame</Category>
|
||||||
|
- </Or>
|
||||||
|
- </And>
|
||||||
|
- </Include>
|
||||||
|
- </Menu>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>TacticStrategy</Name>
|
||||||
|
- <Directory>kde-games-strategy.directory</Directory>
|
||||||
|
- <Include>
|
||||||
|
- <And>
|
||||||
|
- <Category>Game</Category>
|
||||||
|
- <Category>StrategyGame</Category>
|
||||||
|
- </And>
|
||||||
|
- </Include>
|
||||||
|
- </Menu>
|
||||||
|
- <Include>
|
||||||
|
- <And>
|
||||||
|
- <Category>Game</Category>
|
||||||
|
- <Not>
|
||||||
|
- <Category>ArcadeGame</Category>
|
||||||
|
- <Category>BoardGame</Category>
|
||||||
|
- <Category>CardGame</Category>
|
||||||
|
- <Category>X-KDE-KidsGame</Category>
|
||||||
|
- <Category>KidsGame</Category>
|
||||||
|
- <Category>StrategyGame</Category>
|
||||||
|
- </Not>
|
||||||
|
- </And>
|
||||||
|
- </Include>
|
||||||
|
- </Menu>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>Graphics</Name>
|
||||||
|
- <Directory>kde-graphics.directory</Directory>
|
||||||
|
- <Include>
|
||||||
|
- <And>
|
||||||
|
- <Category>Graphics</Category>
|
||||||
|
- <Not><Category>X-KDE-More</Category></Not>
|
||||||
|
- <Not><Filename>ooo-draw.desktop</Filename></Not>
|
||||||
|
- </And>
|
||||||
|
- </Include>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>More</Name>
|
||||||
|
- <Directory>kde-more.directory</Directory>
|
||||||
|
- <Include>
|
||||||
|
- <And>
|
||||||
|
- <Category>Graphics</Category>
|
||||||
|
- <Category>X-KDE-More</Category>
|
||||||
|
- </And>
|
||||||
|
- </Include>
|
||||||
|
- </Menu>
|
||||||
|
- </Menu>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>Internet</Name>
|
||||||
|
- <Directory>kde-internet.directory</Directory>
|
||||||
|
- <Include>
|
||||||
|
- <And>
|
||||||
|
- <Category>Network</Category>
|
||||||
|
- <Not><Category>X-KDE-More</Category></Not>
|
||||||
|
- </And>
|
||||||
|
- </Include>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>Terminal</Name>
|
||||||
|
- <Directory>kde-internet-terminal.directory</Directory>
|
||||||
|
- </Menu>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>More</Name>
|
||||||
|
- <Directory>kde-more.directory</Directory>
|
||||||
|
- <Include>
|
||||||
|
- <And>
|
||||||
|
- <Category>Network</Category>
|
||||||
|
- <Category>X-KDE-More</Category>
|
||||||
|
- </And>
|
||||||
|
- </Include>
|
||||||
|
- </Menu>
|
||||||
|
- </Menu>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>Multimedia</Name>
|
||||||
|
- <Directory>kde-multimedia.directory</Directory>
|
||||||
|
- <Include>
|
||||||
|
- <And>
|
||||||
|
- <Category>AudioVideo</Category>
|
||||||
|
- <Not><Category>X-KDE-More</Category></Not>
|
||||||
|
- </And>
|
||||||
|
- </Include>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>More</Name>
|
||||||
|
- <Directory>kde-more.directory</Directory>
|
||||||
|
- <Include>
|
||||||
|
- <And>
|
||||||
|
- <Category>AudioVideo</Category>
|
||||||
|
- <Category>X-KDE-More</Category>
|
||||||
|
- </And>
|
||||||
|
- </Include>
|
||||||
|
- </Menu>
|
||||||
|
- </Menu>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>Office</Name>
|
||||||
|
- <Directory>kde-office.directory</Directory>
|
||||||
|
- <Layout>
|
||||||
|
- <Merge type="menus"/>
|
||||||
|
- <Merge type="files"/>
|
||||||
|
- <Separator/>
|
||||||
|
- <Menuname>More</Menuname>
|
||||||
|
- </Layout>
|
||||||
|
- <Include>
|
||||||
|
- <And>
|
||||||
|
- <Category>Office</Category>
|
||||||
|
- <Not><Category>X-KDE-More</Category></Not>
|
||||||
|
- </And>
|
||||||
|
- <Filename>ooo-draw.desktop</Filename>
|
||||||
|
- </Include>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>More</Name>
|
||||||
|
- <Directory>kde-more.directory</Directory>
|
||||||
|
- <Include>
|
||||||
|
- <And>
|
||||||
|
- <Category>Office</Category>
|
||||||
|
- <Category>X-KDE-More</Category>
|
||||||
|
- </And>
|
||||||
|
- </Include>
|
||||||
|
- </Menu>
|
||||||
|
- </Menu>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>Settingsmenu</Name>
|
||||||
|
- <Directory>kde-settingsmenu.directory</Directory>
|
||||||
|
- <Include>
|
||||||
|
- <Category>Settings</Category>
|
||||||
|
- </Include>
|
||||||
|
- </Menu>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>System</Name>
|
||||||
|
- <Directory>kde-system.directory</Directory>
|
||||||
|
- <Include>
|
||||||
|
- <And>
|
||||||
|
- <Category>System</Category>
|
||||||
|
- <Not><Category>X-KDE-More</Category></Not>
|
||||||
|
- </And>
|
||||||
|
- </Include>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>SuperUser</Name>
|
||||||
|
- <Directory>kde-system-su.directory</Directory>
|
||||||
|
- <Include>
|
||||||
|
- <And>
|
||||||
|
- <Category>X-KDE-System-su</Category>
|
||||||
|
- <Not><Category>X-KDE-More</Category></Not>
|
||||||
|
- </And>
|
||||||
|
- </Include>
|
||||||
|
- </Menu>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>More</Name>
|
||||||
|
- <Directory>kde-more.directory</Directory>
|
||||||
|
- <Include>
|
||||||
|
- <And>
|
||||||
|
- <Category>System</Category>
|
||||||
|
- <Category>X-KDE-More</Category>
|
||||||
|
- </And>
|
||||||
|
- </Include>
|
||||||
|
- </Menu>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>ScreenSavers</Name>
|
||||||
|
- <Directory>kde-system-screensavers.directory</Directory>
|
||||||
|
- </Menu>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>Terminal</Name>
|
||||||
|
- <Directory>kde-system-terminal.directory</Directory>
|
||||||
|
- </Menu>
|
||||||
|
- </Menu>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>Utilities</Name>
|
||||||
|
- <Directory>kde-utilities.directory</Directory>
|
||||||
|
- <Include>
|
||||||
|
- <And>
|
||||||
|
- <Category>Utility</Category>
|
||||||
|
- <Not><Category>Accessibility</Category></Not>
|
||||||
|
- <Not><Category>X-KDE-Utilities-Desktop</Category></Not>
|
||||||
|
- <Not><Category>X-KDE-Utilities-Peripherals</Category></Not>
|
||||||
|
- <Not><Category>X-KDE-Utilities-PIM</Category></Not>
|
||||||
|
- <Not><Category>X-KDE-More</Category></Not>
|
||||||
|
- </And>
|
||||||
|
- </Include>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>Accessibility</Name>
|
||||||
|
- <Directory>kde-utilities-accessibility.directory</Directory>
|
||||||
|
- <Include>
|
||||||
|
- <And>
|
||||||
|
- <Category>Utility</Category>
|
||||||
|
- <Category>Accessibility</Category>
|
||||||
|
- </And>
|
||||||
|
- </Include>
|
||||||
|
- </Menu>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>Desktop</Name>
|
||||||
|
- <Directory>kde-utilities-desktop.directory</Directory>
|
||||||
|
- <Include>
|
||||||
|
- <And>
|
||||||
|
- <Category>Utility</Category>
|
||||||
|
- <Category>X-KDE-Utilities-Desktop</Category>
|
||||||
|
- </And>
|
||||||
|
- </Include>
|
||||||
|
- </Menu>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>Editors</Name>
|
||||||
|
- <Directory>kde-editors.directory</Directory>
|
||||||
|
- <Include>
|
||||||
|
- <Category>TextEditor</Category>
|
||||||
|
- </Include>
|
||||||
|
- </Menu>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>PIM</Name>
|
||||||
|
- <Directory>kde-utilities-pim.directory</Directory>
|
||||||
|
- <Include>
|
||||||
|
- <And>
|
||||||
|
- <Category>Utility</Category>
|
||||||
|
- <Category>X-KDE-Utilities-PIM</Category>
|
||||||
|
- </And>
|
||||||
|
- </Include>
|
||||||
|
- </Menu>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>Toys</Name>
|
||||||
|
- <Directory>kde-toys.directory</Directory>
|
||||||
|
- <Include>
|
||||||
|
- <Category>Amusement</Category>
|
||||||
|
- </Include>
|
||||||
|
- </Menu>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>XUtilities</Name>
|
||||||
|
- <Directory>kde-utilities-xutils.directory</Directory>
|
||||||
|
- </Menu>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>More</Name>
|
||||||
|
- <Directory>kde-more.directory</Directory>
|
||||||
|
- <Include>
|
||||||
|
- <And>
|
||||||
|
- <Category>Utility</Category>
|
||||||
|
- <Category>X-KDE-More</Category>
|
||||||
|
- </And>
|
||||||
|
- </Include>
|
||||||
|
- </Menu>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>More</Name>
|
||||||
|
- <Directory>kde-more.directory</Directory>
|
||||||
|
- <Include>
|
||||||
|
- <And>
|
||||||
|
- <Category>Utility</Category>
|
||||||
|
- <Category>X-KDE-More</Category>
|
||||||
|
- </And>
|
||||||
|
- </Include>
|
||||||
|
- </Menu>
|
||||||
|
- </Menu>
|
||||||
|
- <Include>
|
||||||
|
- <And>
|
||||||
|
- <Category>KDE</Category>
|
||||||
|
- <Category>Core</Category>
|
||||||
|
- </And>
|
||||||
|
- </Include>
|
||||||
|
- <DefaultMergeDirs/>
|
||||||
|
-
|
||||||
|
- <Menu>
|
||||||
|
- <Name>Debian</Name>
|
||||||
|
- <Directory>debian.directory</Directory>
|
||||||
|
- <MergeFile>debian-menu.menu</MergeFile>
|
||||||
|
- </Menu>
|
||||||
|
-
|
||||||
|
- <MergeDir>applications-merged</MergeDir>
|
||||||
|
- <MergeFile>applications-kmenuedit.menu</MergeFile>
|
||||||
|
-</Menu>
|
||||||
|
diff -Nuar trinity-tdelibs-3.5.13.2/kded.ORI/CMakeLists.txt trinity-tdelibs-3.5.13.2/kded/CMakeLists.txt
|
||||||
|
--- trinity-tdelibs-3.5.13.2/kded.ORI/CMakeLists.txt 2013-07-28 15:03:29.861478619 +0200
|
||||||
|
+++ trinity-tdelibs-3.5.13.2/kded/CMakeLists.txt 2013-07-28 15:03:45.806126508 +0200
|
||||||
|
@@ -35,7 +35,7 @@
|
||||||
|
##### other data ################################
|
||||||
|
|
||||||
|
install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
|
||||||
|
-install( FILES applications.menu DESTINATION ${XDG_MENU_INSTALL_DIR} )
|
||||||
|
+install( FILES tde-applications.menu DESTINATION ${XDG_MENU_INSTALL_DIR} )
|
||||||
|
install( FILES kded.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
|
||||||
|
|
||||||
|
|
||||||
|
diff -Nuar trinity-tdelibs-3.5.13.2/kded.ORI/kbuildsycoca.cpp trinity-tdelibs-3.5.13.2/kded/kbuildsycoca.cpp
|
||||||
|
--- trinity-tdelibs-3.5.13.2/kded.ORI/kbuildsycoca.cpp 2013-07-28 15:03:29.861478619 +0200
|
||||||
|
+++ trinity-tdelibs-3.5.13.2/kded/kbuildsycoca.cpp 2013-07-28 15:04:11.314563211 +0200
|
||||||
|
@@ -379,7 +379,7 @@
|
||||||
|
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);
|
||||||
|
diff -Nuar trinity-tdelibs-3.5.13.2/kded.ORI/tde-applications.menu trinity-tdelibs-3.5.13.2/kded/tde-applications.menu
|
||||||
|
--- trinity-tdelibs-3.5.13.2/kded.ORI/tde-applications.menu 1970-01-01 01:00:00.000000000 +0100
|
||||||
|
+++ trinity-tdelibs-3.5.13.2/kded/tde-applications.menu 2013-06-07 19:23:04.000000000 +0200
|
||||||
|
@@ -0,0 +1,472 @@
|
||||||
|
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
|
||||||
|
+ "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
|
||||||
|
+
|
||||||
|
+<Menu>
|
||||||
|
+ <Name>Applications</Name>
|
||||||
|
+ <Directory>tde-main.directory</Directory>
|
||||||
|
+ <!-- Search the default locations -->
|
||||||
|
+ <KDELegacyDirs/>
|
||||||
|
+ <DefaultAppDirs/>
|
||||||
|
+ <DefaultDirectoryDirs/>
|
||||||
|
+ <DefaultLayout>
|
||||||
|
+ <Merge type="menus"/>
|
||||||
|
+ <Merge type="files"/>
|
||||||
|
+ <Separator/>
|
||||||
|
+ <Menuname>More</Menuname>
|
||||||
|
+ </DefaultLayout>
|
||||||
|
+ <Layout>
|
||||||
|
+ <Merge type="menus"/>
|
||||||
|
+ <Menuname>Applications</Menuname>
|
||||||
|
+ <Merge type="files"/>
|
||||||
|
+ </Layout>
|
||||||
|
+
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>Applications</Name>
|
||||||
|
+ <Directory>tde-unknown.directory</Directory>
|
||||||
|
+ <OnlyUnallocated/>
|
||||||
|
+ <Include>
|
||||||
|
+ <Not>
|
||||||
|
+ <!-- Don't list non-KDE core applications -->
|
||||||
|
+ <And>
|
||||||
|
+ <Category>Core</Category>
|
||||||
|
+ <Not><Category>KDE</Category></Not>
|
||||||
|
+ </And>
|
||||||
|
+ <!-- Don't list SUSE's YaST in here -->
|
||||||
|
+ <Category>X-SuSE-YaST</Category>
|
||||||
|
+ </Not>
|
||||||
|
+ </Include>
|
||||||
|
+ </Menu>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>Development</Name>
|
||||||
|
+ <Directory>tde-development.directory</Directory>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>X-KDE-KDevelopIDE</Name>
|
||||||
|
+ <Directory>tde-development-kdevelop.directory</Directory>
|
||||||
|
+ <Include>
|
||||||
|
+ <And>
|
||||||
|
+ <Category>Development</Category>
|
||||||
|
+ <Category>X-KDE-KDevelopIDE</Category>
|
||||||
|
+ </And>
|
||||||
|
+ </Include>
|
||||||
|
+ </Menu>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>Translation</Name>
|
||||||
|
+ <Directory>tde-development-translation.directory</Directory>
|
||||||
|
+ <Include>
|
||||||
|
+ <And>
|
||||||
|
+ <Category>Development</Category>
|
||||||
|
+ <Category>Translation</Category>
|
||||||
|
+ </And>
|
||||||
|
+ </Include>
|
||||||
|
+ </Menu>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>Web Development</Name>
|
||||||
|
+ <Directory>tde-development-webdevelopment.directory</Directory>
|
||||||
|
+ <Include>
|
||||||
|
+ <And>
|
||||||
|
+ <Category>Development</Category>
|
||||||
|
+ <Category>WebDevelopment</Category>
|
||||||
|
+ </And>
|
||||||
|
+ </Include>
|
||||||
|
+ </Menu>
|
||||||
|
+ <Include>
|
||||||
|
+ <And>
|
||||||
|
+ <Category>Development</Category>
|
||||||
|
+ <Not><Category>X-KDE-KDevelopIDE</Category></Not>
|
||||||
|
+ <Not><Category>Translation</Category></Not>
|
||||||
|
+ <Not><Category>WebDevelopment</Category></Not>
|
||||||
|
+ </And>
|
||||||
|
+ </Include>
|
||||||
|
+ </Menu>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>Science</Name>
|
||||||
|
+ <Directory>tde-science.directory</Directory>
|
||||||
|
+ <Include>
|
||||||
|
+ <And><!-- Include /any/ Science app which is not an Education app -->
|
||||||
|
+ <Or>
|
||||||
|
+ <Category>Astronomy</Category>
|
||||||
|
+ <Category>Biology</Category>
|
||||||
|
+ <Category>Chemistry</Category>
|
||||||
|
+ <Category>Geology</Category>
|
||||||
|
+ <Category>MedicalSoftware</Category>
|
||||||
|
+ <Category>Physics</Category>
|
||||||
|
+ <Category>Math</Category>
|
||||||
|
+ <Category>Science</Category>
|
||||||
|
+ </Or>
|
||||||
|
+ <Not><Category>Education</Category></Not>
|
||||||
|
+ </And>
|
||||||
|
+ </Include>
|
||||||
|
+ </Menu>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>Edutainment</Name>
|
||||||
|
+ <Directory>tde-edutainment.directory</Directory>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>Languages</Name>
|
||||||
|
+ <Directory>tde-edu-languages.directory</Directory>
|
||||||
|
+ <Include>
|
||||||
|
+ <And>
|
||||||
|
+ <Category>Education</Category>
|
||||||
|
+ <Or>
|
||||||
|
+ <Category>Languages</Category>
|
||||||
|
+ <Category>X-KDE-Edu-Language</Category>
|
||||||
|
+ </Or>
|
||||||
|
+ </And>
|
||||||
|
+ </Include>
|
||||||
|
+ </Menu>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>Mathematics</Name>
|
||||||
|
+ <Directory>tde-edu-mathematics.directory</Directory>
|
||||||
|
+ <Include>
|
||||||
|
+ <And>
|
||||||
|
+ <Category>Education</Category>
|
||||||
|
+ <Category>Math</Category>
|
||||||
|
+ </And>
|
||||||
|
+ </Include>
|
||||||
|
+ </Menu>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>Miscellaneous</Name>
|
||||||
|
+ <Directory>tde-edu-miscellaneous.directory</Directory>
|
||||||
|
+ <Include>
|
||||||
|
+ <And>
|
||||||
|
+ <Category>Education</Category>
|
||||||
|
+ <Not>
|
||||||
|
+ <Category>Languages</Category>
|
||||||
|
+ <Category>X-KDE-Edu-Language</Category>
|
||||||
|
+ <Category>Math</Category>
|
||||||
|
+ <Category>Science</Category>
|
||||||
|
+ <Category>Teaching</Category>
|
||||||
|
+ <Category>X-KDE-Edu-Teaching</Category>
|
||||||
|
+ </Not>
|
||||||
|
+ </And>
|
||||||
|
+ </Include>
|
||||||
|
+ </Menu>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>Science</Name>
|
||||||
|
+ <Directory>tde-edu-science.directory</Directory>
|
||||||
|
+ <Include>
|
||||||
|
+ <And>
|
||||||
|
+ <Category>Education</Category>
|
||||||
|
+ <Category>Science</Category>
|
||||||
|
+ </And>
|
||||||
|
+ </Include>
|
||||||
|
+ </Menu>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>Tools</Name>
|
||||||
|
+ <Directory>tde-edu-tools.directory</Directory>
|
||||||
|
+ <Include>
|
||||||
|
+ <And>
|
||||||
|
+ <Category>Education</Category>
|
||||||
|
+ <Or>
|
||||||
|
+ <Category>Teaching</Category>
|
||||||
|
+ <Category>X-KDE-Edu-Teaching</Category>
|
||||||
|
+ </Or>
|
||||||
|
+ </And>
|
||||||
|
+ </Include>
|
||||||
|
+ </Menu>
|
||||||
|
+ </Menu>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>Games</Name>
|
||||||
|
+ <Directory>tde-games.directory</Directory>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>Arcade</Name>
|
||||||
|
+ <Directory>tde-games-arcade.directory</Directory>
|
||||||
|
+ <Include>
|
||||||
|
+ <And>
|
||||||
|
+ <Category>Game</Category>
|
||||||
|
+ <Category>ArcadeGame</Category>
|
||||||
|
+ </And>
|
||||||
|
+ </Include>
|
||||||
|
+ </Menu>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>Board</Name>
|
||||||
|
+ <Directory>tde-games-board.directory</Directory>
|
||||||
|
+ <Include>
|
||||||
|
+ <And>
|
||||||
|
+ <Category>Game</Category>
|
||||||
|
+ <Category>BoardGame</Category>
|
||||||
|
+ </And>
|
||||||
|
+ </Include>
|
||||||
|
+ </Menu>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>Card</Name>
|
||||||
|
+ <Directory>tde-games-card.directory</Directory>
|
||||||
|
+ <Include>
|
||||||
|
+ <And>
|
||||||
|
+ <Category>Game</Category>
|
||||||
|
+ <Category>CardGame</Category>
|
||||||
|
+ </And>
|
||||||
|
+ </Include>
|
||||||
|
+ </Menu>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>Kidsgames</Name>
|
||||||
|
+ <Directory>tde-games-kids.directory</Directory>
|
||||||
|
+ <Include>
|
||||||
|
+ <And>
|
||||||
|
+ <Category>Game</Category>
|
||||||
|
+ <Or>
|
||||||
|
+ <Category>X-KDE-KidsGame</Category>
|
||||||
|
+ <Category>KidsGame</Category>
|
||||||
|
+ </Or>
|
||||||
|
+ </And>
|
||||||
|
+ </Include>
|
||||||
|
+ </Menu>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>TacticStrategy</Name>
|
||||||
|
+ <Directory>tde-games-strategy.directory</Directory>
|
||||||
|
+ <Include>
|
||||||
|
+ <And>
|
||||||
|
+ <Category>Game</Category>
|
||||||
|
+ <Category>StrategyGame</Category>
|
||||||
|
+ </And>
|
||||||
|
+ </Include>
|
||||||
|
+ </Menu>
|
||||||
|
+ <Include>
|
||||||
|
+ <And>
|
||||||
|
+ <Category>Game</Category>
|
||||||
|
+ <Not>
|
||||||
|
+ <Category>ArcadeGame</Category>
|
||||||
|
+ <Category>BoardGame</Category>
|
||||||
|
+ <Category>CardGame</Category>
|
||||||
|
+ <Category>X-KDE-KidsGame</Category>
|
||||||
|
+ <Category>KidsGame</Category>
|
||||||
|
+ <Category>StrategyGame</Category>
|
||||||
|
+ </Not>
|
||||||
|
+ </And>
|
||||||
|
+ </Include>
|
||||||
|
+ </Menu>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>Graphics</Name>
|
||||||
|
+ <Directory>tde-graphics.directory</Directory>
|
||||||
|
+ <Include>
|
||||||
|
+ <And>
|
||||||
|
+ <Category>Graphics</Category>
|
||||||
|
+ <Not><Category>X-KDE-More</Category></Not>
|
||||||
|
+ <Not><Filename>ooo-draw.desktop</Filename></Not>
|
||||||
|
+ </And>
|
||||||
|
+ </Include>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>More</Name>
|
||||||
|
+ <Directory>tde-more.directory</Directory>
|
||||||
|
+ <Include>
|
||||||
|
+ <And>
|
||||||
|
+ <Category>Graphics</Category>
|
||||||
|
+ <Category>X-KDE-More</Category>
|
||||||
|
+ </And>
|
||||||
|
+ </Include>
|
||||||
|
+ </Menu>
|
||||||
|
+ </Menu>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>Internet</Name>
|
||||||
|
+ <Directory>tde-internet.directory</Directory>
|
||||||
|
+ <Include>
|
||||||
|
+ <And>
|
||||||
|
+ <Category>Network</Category>
|
||||||
|
+ <Not><Category>X-KDE-More</Category></Not>
|
||||||
|
+ </And>
|
||||||
|
+ </Include>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>Terminal</Name>
|
||||||
|
+ <Directory>tde-internet-terminal.directory</Directory>
|
||||||
|
+ </Menu>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>More</Name>
|
||||||
|
+ <Directory>tde-more.directory</Directory>
|
||||||
|
+ <Include>
|
||||||
|
+ <And>
|
||||||
|
+ <Category>Network</Category>
|
||||||
|
+ <Category>X-KDE-More</Category>
|
||||||
|
+ </And>
|
||||||
|
+ </Include>
|
||||||
|
+ </Menu>
|
||||||
|
+ </Menu>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>Multimedia</Name>
|
||||||
|
+ <Directory>tde-multimedia.directory</Directory>
|
||||||
|
+ <Include>
|
||||||
|
+ <And>
|
||||||
|
+ <Category>AudioVideo</Category>
|
||||||
|
+ <Not><Category>X-KDE-More</Category></Not>
|
||||||
|
+ </And>
|
||||||
|
+ </Include>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>More</Name>
|
||||||
|
+ <Directory>tde-more.directory</Directory>
|
||||||
|
+ <Include>
|
||||||
|
+ <And>
|
||||||
|
+ <Category>AudioVideo</Category>
|
||||||
|
+ <Category>X-KDE-More</Category>
|
||||||
|
+ </And>
|
||||||
|
+ </Include>
|
||||||
|
+ </Menu>
|
||||||
|
+ </Menu>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>Office</Name>
|
||||||
|
+ <Directory>tde-office.directory</Directory>
|
||||||
|
+ <Layout>
|
||||||
|
+ <Merge type="menus"/>
|
||||||
|
+ <Merge type="files"/>
|
||||||
|
+ <Separator/>
|
||||||
|
+ <Menuname>More</Menuname>
|
||||||
|
+ </Layout>
|
||||||
|
+ <Include>
|
||||||
|
+ <And>
|
||||||
|
+ <Category>Office</Category>
|
||||||
|
+ <Not><Category>X-KDE-More</Category></Not>
|
||||||
|
+ </And>
|
||||||
|
+ <Filename>ooo-draw.desktop</Filename>
|
||||||
|
+ </Include>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>More</Name>
|
||||||
|
+ <Directory>tde-more.directory</Directory>
|
||||||
|
+ <Include>
|
||||||
|
+ <And>
|
||||||
|
+ <Category>Office</Category>
|
||||||
|
+ <Category>X-KDE-More</Category>
|
||||||
|
+ </And>
|
||||||
|
+ </Include>
|
||||||
|
+ </Menu>
|
||||||
|
+ </Menu>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>Settingsmenu</Name>
|
||||||
|
+ <Directory>tde-settingsmenu.directory</Directory>
|
||||||
|
+ <Include>
|
||||||
|
+ <Category>Settings</Category>
|
||||||
|
+ </Include>
|
||||||
|
+ </Menu>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>System</Name>
|
||||||
|
+ <Directory>tde-system.directory</Directory>
|
||||||
|
+ <Include>
|
||||||
|
+ <And>
|
||||||
|
+ <Category>System</Category>
|
||||||
|
+ <Not><Category>X-KDE-More</Category></Not>
|
||||||
|
+ </And>
|
||||||
|
+ </Include>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>SuperUser</Name>
|
||||||
|
+ <Directory>tde-system-su.directory</Directory>
|
||||||
|
+ <Include>
|
||||||
|
+ <And>
|
||||||
|
+ <Category>X-KDE-System-su</Category>
|
||||||
|
+ <Not><Category>X-KDE-More</Category></Not>
|
||||||
|
+ </And>
|
||||||
|
+ </Include>
|
||||||
|
+ </Menu>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>More</Name>
|
||||||
|
+ <Directory>tde-more.directory</Directory>
|
||||||
|
+ <Include>
|
||||||
|
+ <And>
|
||||||
|
+ <Category>System</Category>
|
||||||
|
+ <Category>X-KDE-More</Category>
|
||||||
|
+ </And>
|
||||||
|
+ </Include>
|
||||||
|
+ </Menu>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>ScreenSavers</Name>
|
||||||
|
+ <Directory>tde-system-screensavers.directory</Directory>
|
||||||
|
+ </Menu>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>Terminal</Name>
|
||||||
|
+ <Directory>tde-system-terminal.directory</Directory>
|
||||||
|
+ </Menu>
|
||||||
|
+ </Menu>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>Utilities</Name>
|
||||||
|
+ <Directory>tde-utilities.directory</Directory>
|
||||||
|
+ <Include>
|
||||||
|
+ <And>
|
||||||
|
+ <Category>Utility</Category>
|
||||||
|
+ <Not><Category>Accessibility</Category></Not>
|
||||||
|
+ <Not><Category>X-KDE-Utilities-Desktop</Category></Not>
|
||||||
|
+ <Not><Category>X-KDE-Utilities-Peripherals</Category></Not>
|
||||||
|
+ <Not><Category>X-KDE-Utilities-PIM</Category></Not>
|
||||||
|
+ <Not><Category>X-KDE-More</Category></Not>
|
||||||
|
+ </And>
|
||||||
|
+ </Include>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>Accessibility</Name>
|
||||||
|
+ <Directory>tde-utilities-accessibility.directory</Directory>
|
||||||
|
+ <Include>
|
||||||
|
+ <And>
|
||||||
|
+ <Category>Utility</Category>
|
||||||
|
+ <Category>Accessibility</Category>
|
||||||
|
+ </And>
|
||||||
|
+ </Include>
|
||||||
|
+ </Menu>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>Desktop</Name>
|
||||||
|
+ <Directory>tde-utilities-desktop.directory</Directory>
|
||||||
|
+ <Include>
|
||||||
|
+ <And>
|
||||||
|
+ <Category>Utility</Category>
|
||||||
|
+ <Category>X-KDE-Utilities-Desktop</Category>
|
||||||
|
+ </And>
|
||||||
|
+ </Include>
|
||||||
|
+ </Menu>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>Editors</Name>
|
||||||
|
+ <Directory>tde-editors.directory</Directory>
|
||||||
|
+ <Include>
|
||||||
|
+ <Category>TextEditor</Category>
|
||||||
|
+ </Include>
|
||||||
|
+ </Menu>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>PIM</Name>
|
||||||
|
+ <Directory>tde-utilities-pim.directory</Directory>
|
||||||
|
+ <Include>
|
||||||
|
+ <And>
|
||||||
|
+ <Category>Utility</Category>
|
||||||
|
+ <Category>X-KDE-Utilities-PIM</Category>
|
||||||
|
+ </And>
|
||||||
|
+ </Include>
|
||||||
|
+ </Menu>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>Toys</Name>
|
||||||
|
+ <Directory>tde-toys.directory</Directory>
|
||||||
|
+ <Include>
|
||||||
|
+ <Category>Amusement</Category>
|
||||||
|
+ </Include>
|
||||||
|
+ </Menu>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>XUtilities</Name>
|
||||||
|
+ <Directory>tde-utilities-xutils.directory</Directory>
|
||||||
|
+ </Menu>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>More</Name>
|
||||||
|
+ <Directory>tde-more.directory</Directory>
|
||||||
|
+ <Include>
|
||||||
|
+ <And>
|
||||||
|
+ <Category>Utility</Category>
|
||||||
|
+ <Category>X-KDE-More</Category>
|
||||||
|
+ </And>
|
||||||
|
+ </Include>
|
||||||
|
+ </Menu>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>More</Name>
|
||||||
|
+ <Directory>tde-more.directory</Directory>
|
||||||
|
+ <Include>
|
||||||
|
+ <And>
|
||||||
|
+ <Category>Utility</Category>
|
||||||
|
+ <Category>X-KDE-More</Category>
|
||||||
|
+ </And>
|
||||||
|
+ </Include>
|
||||||
|
+ </Menu>
|
||||||
|
+ </Menu>
|
||||||
|
+ <Include>
|
||||||
|
+ <And>
|
||||||
|
+ <Category>KDE</Category>
|
||||||
|
+ <Category>Core</Category>
|
||||||
|
+ </And>
|
||||||
|
+ </Include>
|
||||||
|
+ <DefaultMergeDirs/>
|
||||||
|
+
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>Debian</Name>
|
||||||
|
+ <Directory>debian.directory</Directory>
|
||||||
|
+ <MergeFile>debian-menu.menu</MergeFile>
|
||||||
|
+ </Menu>
|
||||||
|
+
|
||||||
|
+ <MergeDir>applications-merged</MergeDir>
|
||||||
|
+ <MergeFile>applications-kmenuedit.menu</MergeFile>
|
||||||
|
+</Menu>
|
||||||
@ -0,0 +1,250 @@
|
|||||||
|
diff -Nuar trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/kde-multimedia-music.directory trinity-tdemultimedia-3.5.13.2/kappfinder-data/kde-multimedia-music.directory
|
||||||
|
--- trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/kde-multimedia-music.directory 2013-07-28 16:37:31.827222470 +0200
|
||||||
|
+++ trinity-tdemultimedia-3.5.13.2/kappfinder-data/kde-multimedia-music.directory 1970-01-01 01:00:00.000000000 +0100
|
||||||
|
@@ -1,89 +0,0 @@
|
||||||
|
-[Desktop Entry]
|
||||||
|
-Encoding=UTF-8
|
||||||
|
-Name=Music
|
||||||
|
-Name[br]=Sonerezh
|
||||||
|
-Name[bs]=Muzika
|
||||||
|
-Name[ca]=Música
|
||||||
|
-Name[da]=Musik
|
||||||
|
-Name[el]=Μουσική
|
||||||
|
-Name[eo]=Muziko
|
||||||
|
-Name[es]=Musica
|
||||||
|
-Name[et]=Muusika
|
||||||
|
-Name[eu]=Musika
|
||||||
|
-Name[fa]=موسیقی
|
||||||
|
-Name[fi]=Musiikki
|
||||||
|
-Name[fr]=Musique
|
||||||
|
-Name[ga]=Ceol
|
||||||
|
-Name[gl]=Música
|
||||||
|
-Name[he]=מוזיקה
|
||||||
|
-Name[hu]=Zene
|
||||||
|
-Name[is]=Tónlist
|
||||||
|
-Name[it]=Musica
|
||||||
|
-Name[ja]=音楽
|
||||||
|
-Name[km]=តន្ត្រី
|
||||||
|
-Name[lt]=Muzika
|
||||||
|
-Name[nb]=Musikk
|
||||||
|
-Name[ne]=सङ्गित
|
||||||
|
-Name[nl]=Muziek
|
||||||
|
-Name[nn]=Musikk
|
||||||
|
-Name[pa]=ਸੰਗੀਤ
|
||||||
|
-Name[pl]=Muzyka
|
||||||
|
-Name[pt]=Música
|
||||||
|
-Name[pt_BR]=Música
|
||||||
|
-Name[sk]=Hudba
|
||||||
|
-Name[sl]=Glasba
|
||||||
|
-Name[sr]=Музика
|
||||||
|
-Name[sr@Latn]=Muzika
|
||||||
|
-Name[sv]=Musik
|
||||||
|
-Name[tr]=Müzik
|
||||||
|
-Name[uk]=Музика
|
||||||
|
-Name[zh_CN]=音乐
|
||||||
|
-Name[zh_HK]=音樂
|
||||||
|
-GenericName=Professional Audio
|
||||||
|
-GenericName[bg]=Професионално аудио
|
||||||
|
-GenericName[bs]=Profesionalni audio
|
||||||
|
-GenericName[ca]=Àudio professional
|
||||||
|
-GenericName[cs]=Profesionální zvuk
|
||||||
|
-GenericName[da]=Professionel lyd
|
||||||
|
-GenericName[el]=Επαγγελματικός ήχος
|
||||||
|
-GenericName[es]=Audio profesional
|
||||||
|
-GenericName[et]=Professionaalne audio
|
||||||
|
-GenericName[eu]=Audio profesionala
|
||||||
|
-GenericName[fa]=صوتی حرفهای
|
||||||
|
-GenericName[fi]=Ammattilaisääni
|
||||||
|
-GenericName[fr]=Audio professionnel
|
||||||
|
-GenericName[ga]=Fuaim Phroifisiúnta
|
||||||
|
-GenericName[gl]=Son Profesional
|
||||||
|
-GenericName[he]=שמע מקצועי
|
||||||
|
-GenericName[hu]=Professzinonális minőségű hanganyag
|
||||||
|
-GenericName[is]=Atvinnumannahljóð
|
||||||
|
-GenericName[it]=Audio professionale
|
||||||
|
-GenericName[ja]=プロフェッショナルオーディオ
|
||||||
|
-GenericName[kk]=Кәсіпқой Аудио
|
||||||
|
-GenericName[km]=អូឌីយ៉ូឯកទេស
|
||||||
|
-GenericName[ko]=전문가 오디오
|
||||||
|
-GenericName[lt]=Profesionalus audio
|
||||||
|
-GenericName[mk]=Професионално аудио
|
||||||
|
-GenericName[nb]=Profesjonell lyd
|
||||||
|
-GenericName[nds]=Profeschonell Klang
|
||||||
|
-GenericName[ne]=पेशागत अडियो
|
||||||
|
-GenericName[nl]=Professionele audio
|
||||||
|
-GenericName[nn]=Profesjonell lydhandsaming
|
||||||
|
-GenericName[pa]=ਵਪਾਰਕ ਆਡੀਓ
|
||||||
|
-GenericName[pl]=Profesjonalne audio
|
||||||
|
-GenericName[pt]=Áudio Profissional
|
||||||
|
-GenericName[pt_BR]=Áudio Profissional
|
||||||
|
-GenericName[ru]=Профессиональное аудио
|
||||||
|
-GenericName[sk]=Profesionálne audio
|
||||||
|
-GenericName[sl]=Profesionalni zvok
|
||||||
|
-GenericName[sr]=Професионални звук
|
||||||
|
-GenericName[sr@Latn]=Profesionalni zvuk
|
||||||
|
-GenericName[sv]=Professionellt ljud
|
||||||
|
-GenericName[th]=โปรแกรมจัดการเสียงสำหรับมืออาชีพ
|
||||||
|
-GenericName[tr]=Profesyonel Ses
|
||||||
|
-GenericName[uk]=Професійне аудіо
|
||||||
|
-GenericName[zh_CN]=专业音频
|
||||||
|
-GenericName[zh_HK]=專業音效
|
||||||
|
-GenericName[zh_TW]=專業音效
|
||||||
|
-Icon=package
|
||||||
|
-
|
||||||
|
diff -Nuar trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/kde-multimedia-music.menu trinity-tdemultimedia-3.5.13.2/kappfinder-data/kde-multimedia-music.menu
|
||||||
|
--- trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/kde-multimedia-music.menu 2013-07-28 16:37:31.827222470 +0200
|
||||||
|
+++ trinity-tdemultimedia-3.5.13.2/kappfinder-data/kde-multimedia-music.menu 1970-01-01 01:00:00.000000000 +0100
|
||||||
|
@@ -1,21 +0,0 @@
|
||||||
|
- <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
|
||||||
|
- "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
|
||||||
|
-
|
||||||
|
-<Menu>
|
||||||
|
-<Name>Applications</Name>
|
||||||
|
-<Menu>
|
||||||
|
- <Name>Multimedia</Name>
|
||||||
|
- <Exclude>
|
||||||
|
- <Category>Music</Category>
|
||||||
|
- </Exclude>
|
||||||
|
- <Menu>
|
||||||
|
- <Name>Jack and More</Name>
|
||||||
|
- <Directory>kde-multimedia-music.directory</Directory>
|
||||||
|
- <Include>
|
||||||
|
- <And>
|
||||||
|
- <Category>Music</Category>
|
||||||
|
- </And>
|
||||||
|
- </Include>
|
||||||
|
- </Menu>
|
||||||
|
-</Menu>
|
||||||
|
-</Menu>
|
||||||
|
diff -Nuar trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/Makefile.am trinity-tdemultimedia-3.5.13.2/kappfinder-data/Makefile.am
|
||||||
|
--- trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/Makefile.am 2013-07-28 16:37:31.827222470 +0200
|
||||||
|
+++ trinity-tdemultimedia-3.5.13.2/kappfinder-data/Makefile.am 2013-07-28 16:38:07.202464444 +0200
|
||||||
|
@@ -22,8 +22,8 @@
|
||||||
|
|
||||||
|
EXTRA_DIST = $(kappfinder_multimedia_data_DATA)
|
||||||
|
|
||||||
|
-xdg_directory_DATA = kde-multimedia-music.directory
|
||||||
|
+xdg_directory_DATA = tde-multimedia-music.directory
|
||||||
|
|
||||||
|
-xdg_mergedmenu_DATA = kde-multimedia-music.menu
|
||||||
|
+xdg_mergedmenu_DATA = tde-multimedia-music.menu
|
||||||
|
xdg_mergedmenudir = $(xdg_menudir)/applications-merged
|
||||||
|
|
||||||
|
diff -Nuar trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/tde-multimedia-music.directory trinity-tdemultimedia-3.5.13.2/kappfinder-data/tde-multimedia-music.directory
|
||||||
|
--- trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/tde-multimedia-music.directory 1970-01-01 01:00:00.000000000 +0100
|
||||||
|
+++ trinity-tdemultimedia-3.5.13.2/kappfinder-data/tde-multimedia-music.directory 2013-06-07 19:26:15.000000000 +0200
|
||||||
|
@@ -0,0 +1,89 @@
|
||||||
|
+[Desktop Entry]
|
||||||
|
+Encoding=UTF-8
|
||||||
|
+Name=Music
|
||||||
|
+Name[br]=Sonerezh
|
||||||
|
+Name[bs]=Muzika
|
||||||
|
+Name[ca]=Música
|
||||||
|
+Name[da]=Musik
|
||||||
|
+Name[el]=Μουσική
|
||||||
|
+Name[eo]=Muziko
|
||||||
|
+Name[es]=Musica
|
||||||
|
+Name[et]=Muusika
|
||||||
|
+Name[eu]=Musika
|
||||||
|
+Name[fa]=موسیقی
|
||||||
|
+Name[fi]=Musiikki
|
||||||
|
+Name[fr]=Musique
|
||||||
|
+Name[ga]=Ceol
|
||||||
|
+Name[gl]=Música
|
||||||
|
+Name[he]=מוזיקה
|
||||||
|
+Name[hu]=Zene
|
||||||
|
+Name[is]=Tónlist
|
||||||
|
+Name[it]=Musica
|
||||||
|
+Name[ja]=音楽
|
||||||
|
+Name[km]=តន្ត្រី
|
||||||
|
+Name[lt]=Muzika
|
||||||
|
+Name[nb]=Musikk
|
||||||
|
+Name[ne]=सङ्गित
|
||||||
|
+Name[nl]=Muziek
|
||||||
|
+Name[nn]=Musikk
|
||||||
|
+Name[pa]=ਸੰਗੀਤ
|
||||||
|
+Name[pl]=Muzyka
|
||||||
|
+Name[pt]=Música
|
||||||
|
+Name[pt_BR]=Música
|
||||||
|
+Name[sk]=Hudba
|
||||||
|
+Name[sl]=Glasba
|
||||||
|
+Name[sr]=Музика
|
||||||
|
+Name[sr@Latn]=Muzika
|
||||||
|
+Name[sv]=Musik
|
||||||
|
+Name[tr]=Müzik
|
||||||
|
+Name[uk]=Музика
|
||||||
|
+Name[zh_CN]=音乐
|
||||||
|
+Name[zh_HK]=音樂
|
||||||
|
+GenericName=Professional Audio
|
||||||
|
+GenericName[bg]=Професионално аудио
|
||||||
|
+GenericName[bs]=Profesionalni audio
|
||||||
|
+GenericName[ca]=Àudio professional
|
||||||
|
+GenericName[cs]=Profesionální zvuk
|
||||||
|
+GenericName[da]=Professionel lyd
|
||||||
|
+GenericName[el]=Επαγγελματικός ήχος
|
||||||
|
+GenericName[es]=Audio profesional
|
||||||
|
+GenericName[et]=Professionaalne audio
|
||||||
|
+GenericName[eu]=Audio profesionala
|
||||||
|
+GenericName[fa]=صوتی حرفهای
|
||||||
|
+GenericName[fi]=Ammattilaisääni
|
||||||
|
+GenericName[fr]=Audio professionnel
|
||||||
|
+GenericName[ga]=Fuaim Phroifisiúnta
|
||||||
|
+GenericName[gl]=Son Profesional
|
||||||
|
+GenericName[he]=שמע מקצועי
|
||||||
|
+GenericName[hu]=Professzinonális minőségű hanganyag
|
||||||
|
+GenericName[is]=Atvinnumannahljóð
|
||||||
|
+GenericName[it]=Audio professionale
|
||||||
|
+GenericName[ja]=プロフェッショナルオーディオ
|
||||||
|
+GenericName[kk]=Кәсіпқой Аудио
|
||||||
|
+GenericName[km]=អូឌីយ៉ូឯកទេស
|
||||||
|
+GenericName[ko]=전문가 오디오
|
||||||
|
+GenericName[lt]=Profesionalus audio
|
||||||
|
+GenericName[mk]=Професионално аудио
|
||||||
|
+GenericName[nb]=Profesjonell lyd
|
||||||
|
+GenericName[nds]=Profeschonell Klang
|
||||||
|
+GenericName[ne]=पेशागत अडियो
|
||||||
|
+GenericName[nl]=Professionele audio
|
||||||
|
+GenericName[nn]=Profesjonell lydhandsaming
|
||||||
|
+GenericName[pa]=ਵਪਾਰਕ ਆਡੀਓ
|
||||||
|
+GenericName[pl]=Profesjonalne audio
|
||||||
|
+GenericName[pt]=Áudio Profissional
|
||||||
|
+GenericName[pt_BR]=Áudio Profissional
|
||||||
|
+GenericName[ru]=Профессиональное аудио
|
||||||
|
+GenericName[sk]=Profesionálne audio
|
||||||
|
+GenericName[sl]=Profesionalni zvok
|
||||||
|
+GenericName[sr]=Професионални звук
|
||||||
|
+GenericName[sr@Latn]=Profesionalni zvuk
|
||||||
|
+GenericName[sv]=Professionellt ljud
|
||||||
|
+GenericName[th]=โปรแกรมจัดการเสียงสำหรับมืออาชีพ
|
||||||
|
+GenericName[tr]=Profesyonel Ses
|
||||||
|
+GenericName[uk]=Професійне аудіо
|
||||||
|
+GenericName[zh_CN]=专业音频
|
||||||
|
+GenericName[zh_HK]=專業音效
|
||||||
|
+GenericName[zh_TW]=專業音效
|
||||||
|
+Icon=package
|
||||||
|
+
|
||||||
|
diff -Nuar trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/tde-multimedia-music.menu trinity-tdemultimedia-3.5.13.2/kappfinder-data/tde-multimedia-music.menu
|
||||||
|
--- trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/tde-multimedia-music.menu 1970-01-01 01:00:00.000000000 +0100
|
||||||
|
+++ trinity-tdemultimedia-3.5.13.2/kappfinder-data/tde-multimedia-music.menu 2013-07-28 16:38:14.396310283 +0200
|
||||||
|
@@ -0,0 +1,21 @@
|
||||||
|
+ <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
|
||||||
|
+ "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
|
||||||
|
+
|
||||||
|
+<Menu>
|
||||||
|
+<Name>Applications</Name>
|
||||||
|
+<Menu>
|
||||||
|
+ <Name>Multimedia</Name>
|
||||||
|
+ <Exclude>
|
||||||
|
+ <Category>Music</Category>
|
||||||
|
+ </Exclude>
|
||||||
|
+ <Menu>
|
||||||
|
+ <Name>Jack and More</Name>
|
||||||
|
+ <Directory>tde-multimedia-music.directory</Directory>
|
||||||
|
+ <Include>
|
||||||
|
+ <And>
|
||||||
|
+ <Category>Music</Category>
|
||||||
|
+ </And>
|
||||||
|
+ </Include>
|
||||||
|
+ </Menu>
|
||||||
|
+</Menu>
|
||||||
|
+</Menu>
|
||||||
@ -0,0 +1,30 @@
|
|||||||
|
diff -Nuar trinity-tdevelop-3.5.13.2.ORI/CMakeLists.txt trinity-tdevelop-3.5.13.2/CMakeLists.txt
|
||||||
|
--- trinity-tdevelop-3.5.13.2.ORI/CMakeLists.txt 2013-07-28 16:47:38.143269451 +0200
|
||||||
|
+++ trinity-tdevelop-3.5.13.2/CMakeLists.txt 2013-07-28 16:48:05.207700906 +0200
|
||||||
|
@@ -142,7 +142,7 @@
|
||||||
|
DESTINATION ${XDG_APPS_INSTALL_DIR} )
|
||||||
|
|
||||||
|
install( FILES
|
||||||
|
- kde-development-kdevelop.directory
|
||||||
|
+ tde-development-kdevelop.directory
|
||||||
|
DESTINATION ${XDG_DIRECTORY_INSTALL_DIR} )
|
||||||
|
|
||||||
|
install( FILES
|
||||||
|
diff -Nuar trinity-tdevelop-3.5.13.2.ORI/kde-development-kdevelop.directory trinity-tdevelop-3.5.13.2/kde-development-kdevelop.directory
|
||||||
|
--- trinity-tdevelop-3.5.13.2.ORI/kde-development-kdevelop.directory 2013-07-28 16:47:38.101270333 +0200
|
||||||
|
+++ trinity-tdevelop-3.5.13.2/kde-development-kdevelop.directory 1970-01-01 01:00:00.000000000 +0100
|
||||||
|
@@ -1,5 +0,0 @@
|
||||||
|
-[Desktop Entry]
|
||||||
|
-Encoding=UTF-8
|
||||||
|
-Name=KDevelop
|
||||||
|
-Name[ne]=केडीई विकास
|
||||||
|
-Icon=kdevelop
|
||||||
|
diff -Nuar trinity-tdevelop-3.5.13.2.ORI/tde-development-kdevelop.directory trinity-tdevelop-3.5.13.2/tde-development-kdevelop.directory
|
||||||
|
--- trinity-tdevelop-3.5.13.2.ORI/tde-development-kdevelop.directory 1970-01-01 01:00:00.000000000 +0100
|
||||||
|
+++ trinity-tdevelop-3.5.13.2/tde-development-kdevelop.directory 2013-06-07 19:41:29.000000000 +0200
|
||||||
|
@@ -0,0 +1,5 @@
|
||||||
|
+[Desktop Entry]
|
||||||
|
+Encoding=UTF-8
|
||||||
|
+Name=KDevelop
|
||||||
|
+Name[ne]=केडीई विकास
|
||||||
|
+Icon=kdevelop
|
||||||
Loading…
Reference in new issue