| bf9a43f6 | 2014-10-13 12:51:30 | Timothy Pearson |
Bring undo, redo, find, and revert icons into XDG compliance |
||
|
M lib/widgets/propeditor/propertyeditor.cpp M parts/filelist/filelist_item.cpp M src/simplemainwindow.cpp |
||
diff --git a/lib/widgets/propeditor/propertyeditor.cpp b/lib/widgets/propeditor/propertyeditor.cpp
index e9bd478..780b282 100644
--- a/lib/widgets/propeditor/propertyeditor.cpp
+++ b/lib/widgets/propeditor/propertyeditor.cpp
@@ -192,7 +192,7 @@
m_currentEditArea->hide();
m_undoButton = new TQPushButton(m_currentEditArea);
#ifndef PURE_QT
- m_undoButton->setPixmap(SmallIcon("undo"));
+ m_undoButton->setPixmap(SmallIcon("edit-undo"));
#else
m_undoButton->setPixmap( TQPixmap("undo.xpm") );
#endif
diff --git a/parts/filelist/filelist_item.cpp b/parts/filelist/filelist_item.cpp
index 68eda40..b2df14e 100644
--- a/parts/filelist/filelist_item.cpp
+++ b/parts/filelist/filelist_item.cpp
@@ -54,7 +54,7 @@
setPixmap( 0, SmallIcon("filesave") );
break;
case Dirty:
- setPixmap( 0, SmallIcon("revert") );
+ setPixmap( 0, SmallIcon("document-revert") );
break;
case DirtyAndModified:
setPixmap( 0, SmallIcon("process-stop") );
diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp
index b252bf0..047d072 100644
--- a/src/simplemainwindow.cpp
+++ b/src/simplemainwindow.cpp
@@ -575,7 +575,7 @@
widget->setIcon(SmallIcon("filesave", isize));
break;
case Dirty:
- widget->setIcon(SmallIcon("revert", isize));
+ widget->setIcon(SmallIcon("document-revert", isize));
break;
case DirtyAndModified:
widget->setIcon(SmallIcon("process-stop", isize));
|
||
| 5881f8d0 | 2014-10-13 12:53:03 | Timothy Pearson |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdevelop |
||
|
A languages/cpp/doc/gnome.toc M languages/cpp/doc/CMakeLists.txt M languages/cpp/doc/Makefile.am R languages/cpp/doc/gnome1.toc |
||
diff --git a/languages/cpp/doc/CMakeLists.txt b/languages/cpp/doc/CMakeLists.txt
index 1d86155..0c15988 100644
--- a/languages/cpp/doc/CMakeLists.txt
+++ b/languages/cpp/doc/CMakeLists.txt
@@ -14,7 +14,7 @@
clanlib.toc
cppannotations.toc
gnome_bugs.toc
- gnome1.toc
+ gnome.toc
gnustep.toc
kde2book.toc
kdetemplates.toc
diff --git a/languages/cpp/doc/Makefile.am b/languages/cpp/doc/Makefile.am
index bedd0fd..da9c97f 100644
--- a/languages/cpp/doc/Makefile.am
+++ b/languages/cpp/doc/Makefile.am
@@ -4,7 +4,7 @@
clanlib.toc \
cppannotations.toc \
gnome_bugs.toc \
- gnome1.toc \
+ gnome.toc \
gnustep.toc \
kde2book.toc \
kdetemplates.toc \
diff --git a/languages/cpp/doc/gnome.toc b/languages/cpp/doc/gnome.toc
new file mode 100644
index 0000000..0a38457
--- /dev/null
+++ b/languages/cpp/doc/gnome.toc
@@ -0,0 +1,475 @@
+<!DOCTYPE tdeveloptoc>
+<tdeveloptoc>
+<title>GNOME API Reference</title>
+<base href="http://developer.gnome.org"/>
+<tocsect1 name="GLib" url="glib/stable">
+ <tocsect2 name="GLib Overview" url="glib/stable/glib.html">
+ <tocsect3 name="Compiling the GLib package" url="glib/stable/glib-building.html"/>
+ <tocsect3 name="Cross-compiling the GLib package" url="glib/stable/glib-cross-compiling.html"/>
+ <tocsect3 name="Writing GLib Applications" url="glib/stable/glib-programming.html"/>
+ <tocsect3 name="Compiling GLib Applications" url="glib/stable/glib-compiling.html"/>
+ <tocsect3 name="Running GLib Applications" url="glib/stable/glib-running.html"/>
+ <tocsect3 name="Changes to GLib" url="glib/stable/glib-changes.html"/>
+ <tocsect3 name="Mailing lists and bug reports" url="glib/stable/glib-resources.html"/>
+ </tocsect2>
+ <tocsect2 name="GLib Fundamentals" url="glib/stable/glib-fundamentals.html">
+ <tocsect3 name="Version Information" url="glib/stable/glib-Version-Information.html"/>
+ <tocsect3 name="Basic Types" url="glib/stable/glib-Basic-Types.html"/>
+ <tocsect3 name="Standard Macros" url="glib/stable/glib-Standard-Macros.html"/>
+ <tocsect3 name="Type Conversion Macros" url="glib/stable/glib-Type-Conversion-Macros.html"/>
+ <tocsect3 name="Byte Order Macros" url="glib/stable/glib-Byte-Order-Macros.html"/>
+ <tocsect3 name="Numerical Definitions" url="glib/stable/glib-Numerical-Definitions.html"/>
+ <tocsect3 name="Miscellaneous Macros" url="glib/stable/glib-Miscellaneous-Macros.html"/>
+ <tocsect3 name="Atomic Operations" url="glib/stable/glib-Atomic-Operations.html"/>
+ </tocsect2>
+ <tocsect2 name="GLib Core Application Support" url="glib/stable/glib-core.html">
+ <tocsect3 name="The Main Event Loop" url="glib/stable/glib-The-Main-Event-Loop.html"/>
+ <tocsect3 name="Threads" url="glib/stable/glib-Threads.html"/>
+ <tocsect3 name="Thread Pools" url="glib/stable/glib-Thread-Pools.html"/>
+ <tocsect3 name="Asynchronous Queues" url="glib/stable/glib-Asynchronous-Queues.html"/>
+ <tocsect3 name="Dynamic Loading of Modules" url="glib/stable/glib-Dynamic-Loading-of-Modules.html"/>
+ <tocsect3 name="Memory Allocation" url="glib/stable/glib-Memory-Allocation.html"/>
+ <tocsect3 name="Memory Slices" url="glib/stable/glib-Memory-Slices.html"/>
+ <tocsect3 name="IO Channels" url="glib/stable/glib-IO-Channels.html"/>
+ <tocsect3 name="Error Reporting" url="glib/stable/glib-Error-Reporting.html"/>
+ <tocsect3 name="Message Output and Debugging Functions" url="glib/stable/glib-Warnings-and-Assertions.html"/>
+ <tocsect3 name="Message Logging" url="glib/stable/glib-Message-Logging.html"/>
+ </tocsect2>
+ <tocsect2 name="GLib Utilities" url="glib/stable/glib-utilities.html">
+ <tocsect3 name="String Utility Functions" url="glib/stable/glib-String-Utility-Functions.html"/>
+ <tocsect3 name="Character Set Conversion" url="glib/stable/glib-Character-Set-Conversion.html"/>
+ <tocsect3 name="Unicode Manipulation" url="glib/stable/glib-Unicode-Manipulation.html"/>
+ <tocsect3 name="Base64 Encoding" url="glib/stable/glib-Base64-Encoding.html"/>
+ <tocsect3 name="Data Checksums" url="glib/stable/glib-Data-Checksums.html"/>
+ <tocsect3 name="Secure HMAC Digests" url="glib/stable/glib-Data-HMACs.html"/>
+ <tocsect3 name="Internationalization" url="glib/stable/glib-I18N.html"/>
+ <tocsect3 name="Date and Time Functions" url="glib/stable/glib-Date-and-Time-Functions.html"/>
+ <tocsect3 name="GTimeZone" url="glib/stable/glib-GTimeZone.html"/>
+ <tocsect3 name="GDateTime" url="glib/stable/glib-GDateTime.html"/>
+ <tocsect3 name="Random Numbers" url="glib/stable/glib-Random-Numbers.html"/>
+ <tocsect3 name="Hook Functions" url="glib/stable/glib-Hook-Functions.html"/>
+ <tocsect3 name="Miscellaneous Utility Functions" url="glib/stable/glib-Miscellaneous-Utility-Functions.html"/>
+ <tocsect3 name="Lexical Scanner" url="glib/stable/glib-Lexical-Scanner.html"/>
+ <tocsect3 name="Timers" url="glib/stable/glib-Timers.html"/>
+ <tocsect3 name="Spawning Processes" url="glib/stable/glib-Spawning-Processes.html"/>
+ <tocsect3 name="File Utilities" url="glib/stable/glib-File-Utilities.html"/>
+ <tocsect3 name="URI Functions" url="glib/stable/glib-URI-Functions.html"/>
+ <tocsect3 name="Hostname Utilities" url="glib/stable/glib-Hostname-Utilities.html"/>
+ <tocsect3 name="Shell-related Utilities" url="glib/stable/glib-Shell-related-Utilities.html"/>
+ <tocsect3 name="Commandline option parser" url="glib/stable/glib-Commandline-option-parser.html"/>
+ <tocsect3 name="Glob-style pattern matching" url="glib/stable/glib-Glob-style-pattern-matching.html"/>
+ <tocsect3 name="Perl-compatible regular expressions" url="glib/stable/glib-Perl-compatible-regular-expressions.html"/>
+ <tocsect3 name="Regular expression syntax" url="glib/stable/glib-regex-syntax.html"/>
+ <tocsect3 name="Simple XML Subset Parser" url="glib/stable/glib-Simple-XML-Subset-Parser.html"/>
+ <tocsect3 name="Key-value file parser" url="glib/stable/glib-Key-value-file-parser.html"/>
+ <tocsect3 name="Bookmark file parser" url="glib/stable/glib-Bookmark-file-parser.html"/>
+ <tocsect3 name="Testing" url="glib/stable/glib-Testing.html"/>
+ <tocsect3 name="UNIX-specific utilities and integration" url="glib/stable/glib-UNIX-specific-utilities-and-integration.html"/>
+ <tocsect3 name="Windows Compatibility Functions" url="glib/stable/glib-Windows-Compatibility-Functions.html"/>
+ </tocsect2>
+ <tocsect2 name="GLib Data Types" url="glib/stable/glib-data-types.html">
+ <tocsect3 name="Doubly-Linked Lists" url="glib/stable/glib-Doubly-Linked-Lists.html"/>
+ <tocsect3 name="Singly-Linked Lists" url="glib/stable/glib-Singly-Linked-Lists.html"/>
+ <tocsect3 name="Double-ended Queues" url="glib/stable/glib-Double-ended-Queues.html"/>
+ <tocsect3 name="Sequences" url="glib/stable/glib-Sequences.html"/>
+ <tocsect3 name="Trash Stacks" url="glib/stable/glib-Trash-Stacks.html"/>
+ <tocsect3 name="Hash Tables" url="glib/stable/glib-Hash-Tables.html"/>
+ <tocsect3 name="Strings" url="glib/stable/glib-Strings.html"/>
+ <tocsect3 name="String Chunks" url="glib/stable/glib-String-Chunks.html"/>
+ <tocsect3 name="Arrays" url="glib/stable/glib-Arrays.html"/>
+ <tocsect3 name="Pointer Arrays" url="glib/stable/glib-Pointer-Arrays.html"/>
+ <tocsect3 name="Byte Arrays" url="glib/stable/glib-Byte-Arrays.html"/>
+ <tocsect3 name="Balanced Binary Trees" url="glib/stable/glib-Balanced-Binary-Trees.html"/>
+ <tocsect3 name="N-ary Trees" url="glib/stable/glib-N-ary-Trees.html"/>
+ <tocsect3 name="Quarks" url="glib/stable/glib-Quarks.html"/>
+ <tocsect3 name="Keyed Data Lists" url="glib/stable/glib-Keyed-Data-Lists.html"/>
+ <tocsect3 name="Datasets" url="glib/stable/glib-Datasets.html"/>
+ <tocsect3 name="GVariantType" url="glib/stable/glib-GVariantType.html"/>
+ <tocsect3 name="GVariant" url="glib/stable/glib-GVariant.html"/>
+ <tocsect3 name="GVariant Format Strings" url="glib/stable/gvariant-format-strings.html"/>
+ <tocsect3 name="GVariant Text Format" url="glib/stable/gvariant-text.html"/>
+ </tocsect2>
+ <tocsect2 name="Deprecated APIs" url="glib/stable/deprecated.html">
+ <tocsect3 name="Deprecated thread API" url="glib/stable/glib-Deprecated-Thread-APIs.html"/>
+ <tocsect3 name="Caches" url="glib/stable/glib-Caches.html"/>
+ <tocsect3 name="Relations and Tuples" url="glib/stable/glib-Relations-and-Tuples.html"/>
+ <tocsect3 name="Automatic String Completion" url="glib/stable/glib-Automatic-String-Completion.html"/>
+ </tocsect2>
+ <tocsect2 name="GLib Tools" url="glib/stable/tools.html">
+ <tocsect3 name="glib-gettextize" url="glib/stable/glib-gettextize.html"/>
+ <tocsect3 name="gtester" url="glib/stable/gtester.html"/>
+ <tocsect3 name="gtester-report" url="glib/stable/gtester-report.html"/>
+ </tocsect2>
+</tocsect1>
+
+<tocsect1 name="GDK-Pixbuf" url="gdk-pixbuf/stable/">
+ <tocsect2 name="I. API Reference" url="gdk-pixbuf/stable/rn01.html">
+ <tocsect3 name="Initialization and Versions" url="gdk-pixbuf/stable/gdk-pixbuf-Versioning.html"/>
+ <tocsect3 name="The GdkPixbuf Structure" url="gdk-pixbuf/stable/gdk-pixbuf-The-GdkPixbuf-Structure.html"/>
+ <tocsect3 name="Reference Counting and Memory Mangement" url="gdk-pixbuf/stable/gdk-pixbuf-Reference-Counting-and-Memory-Mangement.html"/>
+ <tocsect3 name="File Loading" url="gdk-pixbuf/stable/gdk-pixbuf-File-Loading.html"/>
+ <tocsect3 name="File saving" url="gdk-pixbuf/stable/gdk-pixbuf-File-saving.html"/>
+ <tocsect3 name="Image Data in Memory" url="gdk-pixbuf/stable/gdk-pixbuf-Image-Data-in-Memory.html"/>
+ <tocsect3 name="Inline data" url="gdk-pixbuf/stable/gdk-pixbuf-Inline-data.html"/>
+ <tocsect3 name="Scaling" url="gdk-pixbuf/stable/gdk-pixbuf-Scaling.html"/>
+ <tocsect3 name="Rendering" url="gdk-pixbuf/stable/gdk-pixbuf-gdk-pixbuf-rendering.html"/>
+ <tocsect3 name="Drawables to Pixbufs" url="gdk-pixbuf/stable/gdk-pixbuf-gdk-pixbuf-from-drawables.html"/>
+ <tocsect3 name="Utilities" url="gdk-pixbuf/stable/gdk-pixbuf-Utilities.html"/>
+ <tocsect3 name="Animations" url="gdk-pixbuf/stable/gdk-pixbuf-Animations.html"/>
+ <tocsect3 name="GdkPixbufLoader" url="gdk-pixbuf/stable/GdkPixbufLoader.html"/>
+ <tocsect3 name="Module Interface" url="gdk-pixbuf/stable/gdk-pixbuf-Module-Interface.html"/>
+ <tocsect3 name="gdk-pixbuf Xlib initialization" url="gdk-pixbuf/stable/gdk-pixbuf-gdk-pixbuf-Xlib-initialization.html"/>
+ <tocsect3 name="Xlib Rendering" url="gdk-pixbuf/stable/gdk-pixbuf-Xlib-Rendering.html"/>
+ <tocsect3 name="X Drawables to Pixbufs" url="gdk-pixbuf/stable/gdk-pixbuf-X-Drawables-to-Pixbufs.html"/>
+ <tocsect3 name="XlibRGB" url="gdk-pixbuf/stable/gdk-pixbuf-XlibRGB.html"/>
+ </tocsect2>
+ <tocsect2 name="II. Tools Reference" url="gdk-pixbuf/stable/rn02.html">
+ <tocsect3 name="gdk-pixbuf-csource" url="gdk-pixbuf/stable/gdk-pixbuf-csource.html"/>
+ <tocsect3 name="gdk-pixbuf-query-loaders" url="gdk-pixbuf/stable/gdk-pixbuf-query-loaders.html"/>
+ </tocsect2>
+</tocsect1>
+
+<tocsect1 name="GDK" url="gdk3/stable">
+ <tocsect2 name="I. API Reference" url="gdk3/stable/reference.html">
+ <tocsect3 name="General" url="gdk3/stable/gdk3-General.html"/>
+ <tocsect3 name="GdkDisplayManager" url="gdk3/stable/GdkDisplayManager.html"/>
+ <tocsect3 name="GdkDisplay" url="gdk3/stable/GdkDisplay.html"/>
+ <tocsect3 name="GdkScreen" url="gdk3/stable/GdkScreen.html"/>
+ <tocsect3 name="GdkDeviceManager" url="gdk3/stable/GdkDeviceManager.html"/>
+ <tocsect3 name="GdkDevice" url="gdk3/stable/GdkDevice.html"/>
+ <tocsect3 name="Points and Rectangles" url="gdk3/stable/gdk3-Points-Rectangles-and-Regions.html"/>
+ <tocsect3 name="Pixbufs" url="gdk3/stable/gdk3-Pixbufs.html"/>
+ <tocsect3 name="RGBA Colors" url="gdk3/stable/gdk3-RGBA-Colors.html"/>
+ <tocsect3 name="Visuals" url="gdk3/stable/gdk3-Visuals.html"/>
+ <tocsect3 name="Cursors" url="gdk3/stable/gdk3-Cursors.html"/>
+ <tocsect3 name="Windows" url="gdk3/stable/gdk3-Windows.html"/>
+ <tocsect3 name="Frame clock" url="gdk3/stable/GdkFrameClock.html"/>
+ <tocsect3 name="Frame timings" url="gdk3/stable/gdk3-GdkFrameTimings.html"/>
+ <tocsect3 name="Events" url="gdk3/stable/gdk3-Events.html"/>
+ <tocsect3 name="Event Structures" url="gdk3/stable/gdk3-Event-Structures.html"/>
+ <tocsect3 name="Key Values" url="gdk3/stable/gdk3-Keyboard-Handling.html"/>
+ <tocsect3 name="Selections" url="gdk3/stable/gdk3-Selections.html"/>
+ <tocsect3 name="Drag And Drop" url="gdk3/stable/gdk3-Drag-and-Drop.html"/>
+ <tocsect3 name="Properties and Atoms" url="gdk3/stable/gdk3-Properties-and-Atoms.html"/>
+ <tocsect3 name="Threads" url="gdk3/stable/gdk3-Threads.html"/>
+ <tocsect3 name="Pango Interaction" url="gdk3/stable/gdk3-Pango-Interaction.html"/>
+ <tocsect3 name="Cairo Interaction" url="gdk3/stable/gdk3-Cairo-Interaction.html"/>
+ <tocsect3 name="X Window System Interaction" url="gdk3/stable/gdk3-X-Window-System-Interaction.html"/>
+ <tocsect3 name="Wayland Interaction" url="gdk3/stable/gdk3-Wayland-Interaction.html"/>
+ <tocsect3 name="Application launching" url="gdk3/stable/gdk3-Application-launching.html"/>
+ <tocsect3 name="Testing" url="gdk3/stable/gdk3-Testing.html"/>
+ </tocsect2>
+ <tocsect2 name="II. Deprecated" url="gdk3/stable/rn02.html">
+ <tocsect3 name="Colors" url="gdk3/stable/gdk3-Colors.html"/>
+ </tocsect2>
+</tocsect1>
+
+<tocsect1 name="GTK+" url="gtk/index.html">
+ <tocsect2 name="GTK+" url="gtk/gtk.html">
+ <tocsect3 name="General" url="gtk/gtk-general.html"/>
+ <tocsect3 name="Version Information" url="gtk/gtk-feature-test-macros.html"/>
+ <tocsect3 name="Graphics Contexts" url="gtk/gtk-graphics-contexts.html"/>
+ <tocsect3 name="Styles" url="gtk/gtk-styles.html"/>
+ <tocsect3 name="Themes" url="gtk/gtk-themes.html"/>
+ <tocsect3 name="Resource Files" url="gtk/gtk-resource-files.html"/>
+ <tocsect3 name="Keyboard Accelerators" url="gtk/gtk-keyboard-accelerators.html"/>
+ <tocsect3 name="Selections" url="gtk/gtk-selections.html"/>
+ <tocsect3 name="Drag and Drop" url="gtk/gtk-drag-and-drop.html"/>
+ <tocsect3 name="Signals" url="gtk/gtk-Q_SIGNALS.html"/>
+ <tocsect3 name="Signal Marshallers" url="gtk/gtk-signal-marshallers.html"/>
** Diff limit reached (max: 250 lines) **
|
||