API tools faq
paste
Advertisement
Guest User

99_remove_symbolic_icons.patch

a guest
Jun 25th, 2012
22
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 16.83 KB | None | 0 0
raw download clone embed print report
  1. Description: Remove use of symbolic icons
  2.  Symbolic icons in Totem just don't work. They're stretched and unhelpful and do not
  3.  fit in with the chosen icon theme in Gnome Classic. This patch makes Totem use the
  4.  icons in the user's chosen theme.
  5.  .
  6.  totem (3.0.1-9solusos1.1) two; urgency=low
  7.  .
  8.    * Removed use of symbolic icons
  9. Author: Ikey Doherty <ikey@solusos.com>
  10.  
  11. ---
  12. Reviewed-By: Ikey Doherty <ikey@solusos.com>
  13. Last-Update: <2012-06-24>
  14.  
  15. --- totem-3.0.1.orig/src/totem-playlist.c
  16. +++ totem-3.0.1/src/totem-playlist.c
  17. @@ -1255,10 +1255,10 @@ set_playing_icon (GtkTreeViewColumn *col
  18.  
  19.     switch (playing) {
  20.         case TOTEM_PLAYLIST_STATUS_PLAYING:
  21. -           icon_name = "media-playback-start-symbolic";
  22. +           icon_name = "media-playback-start";
  23.             break;
  24.         case TOTEM_PLAYLIST_STATUS_PAUSED:
  25. -           icon_name = "media-playback-pause-symbolic";
  26. +           icon_name = "media-playback-pause";
  27.             break;
  28.         case TOTEM_PLAYLIST_STATUS_NONE:
  29.         default:
  30. --- totem-3.0.1.orig/src/totem-dnd-menu.c
  31. +++ totem-3.0.1/src/totem-dnd-menu.c
  32. @@ -91,7 +91,7 @@ totem_drag_ask (gboolean show_add_to)
  33.  
  34.     menu = gtk_menu_new ();
  35.  
  36. -   drag_append_drop_action_menu_item (menu, _("_Play Now"), "media-playback-start-symbolic", GDK_ACTION_MOVE, &dt);
  37. +   drag_append_drop_action_menu_item (menu, _("_Play Now"), "media-playback-start", GDK_ACTION_MOVE, &dt);
  38.  
  39.     if (show_add_to != FALSE)
  40.         drag_append_drop_action_menu_item (menu, _("_Add to Playlist"), "gtk-add", GDK_ACTION_COPY, &dt);
  41. --- totem-3.0.1.orig/src/totem-object.c
  42. +++ totem-3.0.1/src/totem-object.c
  43. @@ -1044,14 +1044,14 @@ play_pause_set_label (TotemObject *totem
  44.     case STATE_PLAYING:
  45.         totem_statusbar_set_text (TOTEM_STATUSBAR (totem->statusbar),
  46.                 _("Playing"));
  47. -       id = "media-playback-pause-symbolic";
  48. +       id = "media-playback-pause";
  49.         tip = N_("Pause");
  50.         totem_playlist_set_playing (totem->playlist, TOTEM_PLAYLIST_STATUS_PLAYING);
  51.         break;
  52.     case STATE_PAUSED:
  53.         totem_statusbar_set_text (TOTEM_STATUSBAR (totem->statusbar),
  54.                 _("Paused"));
  55. -       id = "media-playback-start-symbolic";
  56. +       id = "media-playback-start";
  57.         tip = N_("Play");
  58.         totem_playlist_set_playing (totem->playlist, TOTEM_PLAYLIST_STATUS_PAUSED);
  59.         break;
  60. @@ -1060,7 +1060,7 @@ play_pause_set_label (TotemObject *totem
  61.                 _("Stopped"));
  62.         totem_statusbar_set_time_and_length
  63.             (TOTEM_STATUSBAR (totem->statusbar), 0, 0);
  64. -       id = "media-playback-start-symbolic";
  65. +       id = "media-playback-start";
  66.         totem_playlist_set_playing (totem->playlist, TOTEM_PLAYLIST_STATUS_NONE);
  67.         tip = N_("Play");
  68.         break;
  69. @@ -3061,18 +3061,18 @@ totem_object_action_remote (TotemObject
  70.     switch (cmd) {
  71.     case TOTEM_REMOTE_COMMAND_PLAY:
  72.         totem_action_play (totem);
  73. -       icon_name = "media-playback-start-symbolic";
  74. +       icon_name = "media-playback-start";
  75.         break;
  76.     case TOTEM_REMOTE_COMMAND_PLAYPAUSE:
  77.         if (bacon_video_widget_is_playing (totem->bvw) == FALSE)
  78. -           icon_name = "media-playback-start-symbolic";
  79. +           icon_name = "media-playback-start";
  80.         else
  81. -           icon_name = "media-playback-pause-symbolic";
  82. +           icon_name = "media-playback-pause";
  83.         totem_action_play_pause (totem);
  84.         break;
  85.     case TOTEM_REMOTE_COMMAND_PAUSE:
  86.         totem_action_pause (totem);
  87. -       icon_name = "media-playback-pause-symbolic";
  88. +       icon_name = "media-playback-pause";
  89.         break;
  90.     case TOTEM_REMOTE_COMMAND_STOP: {
  91.         char *mrl, *subtitle;
  92. @@ -3087,7 +3087,7 @@ totem_object_action_remote (TotemObject
  93.             g_free (mrl);
  94.             g_free (subtitle);
  95.         }
  96. -       icon_name = "media-playback-stop-symbolic";
  97. +       icon_name = "media-playback-stop";
  98.         break;
  99.     };
  100.     case TOTEM_REMOTE_COMMAND_SEEK_FORWARD: {
  101. @@ -3100,7 +3100,7 @@ totem_object_action_remote (TotemObject
  102.         } else {
  103.             totem_action_seek_relative (totem, offset * 1000, FALSE);
  104.         }
  105. -       icon_name = "media-seek-forward-symbolic";
  106. +       icon_name = "media-seek-forward";
  107.         break;
  108.     }
  109.     case TOTEM_REMOTE_COMMAND_SEEK_BACKWARD: {
  110. @@ -3112,7 +3112,7 @@ totem_object_action_remote (TotemObject
  111.             totem_action_seek_relative (totem, SEEK_BACKWARD_OFFSET * 1000, FALSE);
  112.         else
  113.             totem_action_seek_relative (totem,  - (offset * 1000), FALSE);
  114. -       icon_name = "media-seek-backward-symbolic";
  115. +       icon_name = "media-seek-backward";
  116.         break;
  117.     }
  118.     case TOTEM_REMOTE_COMMAND_VOLUME_UP:
  119. @@ -3123,11 +3123,11 @@ totem_object_action_remote (TotemObject
  120.         break;
  121.     case TOTEM_REMOTE_COMMAND_NEXT:
  122.         totem_action_next (totem);
  123. -       icon_name = "media-skip-forward-symbolic";
  124. +       icon_name = "media-skip-forward";
  125.         break;
  126.     case TOTEM_REMOTE_COMMAND_PREVIOUS:
  127.         totem_action_previous (totem);
  128. -       icon_name = "media-skip-backward-symbolic";
  129. +       icon_name = "media-skip-backward";
  130.         break;
  131.     case TOTEM_REMOTE_COMMAND_FULLSCREEN:
  132.         totem_action_fullscreen_toggle (totem);
  133. @@ -3473,9 +3473,9 @@ on_video_button_press_event (BaconVideoW
  134.         if (totem_is_fullscreen (totem) != FALSE) {
  135.             const char *icon_name;
  136.             if (bacon_video_widget_is_playing (totem->bvw) == FALSE)
  137. -               icon_name = "media-playback-start-symbolic";
  138. +               icon_name = "media-playback-start";
  139.             else
  140. -               icon_name = "media-playback-pause-symbolic";
  141. +               icon_name = "media-playback-pause";
  142.             totem_fullscreen_show_popups_or_osd (totem->fs, icon_name, FALSE);
  143.         }
  144.         totem_action_play_pause (totem);
  145. @@ -3586,7 +3586,7 @@ totem_action_handle_key_press (TotemObje
  146.     case GDK_KEY_B:
  147.     case GDK_KEY_b:
  148.         totem_action_previous (totem);
  149. -       icon_name = "media-skip-backward-symbolic";
  150. +       icon_name = "media-skip-backward";
  151.         break;
  152.     case GDK_KEY_C:
  153.     case GDK_KEY_c:
  154. @@ -3616,7 +3616,7 @@ totem_action_handle_key_press (TotemObje
  155.     case GDK_KEY_n:
  156.     case GDK_KEY_End:
  157.         totem_action_next (totem);
  158. -       icon_name = "media-skip-forward-symbolic";
  159. +       icon_name = "media-skip-forward";
  160.         break;
  161.     case GDK_KEY_OpenURL:
  162.         totem_action_fullscreen (totem, FALSE);
  163. @@ -3635,9 +3635,9 @@ totem_action_handle_key_press (TotemObje
  164.             totem_action_show_properties (totem);
  165.         } else {
  166.             if (bacon_video_widget_is_playing (totem->bvw) == FALSE)
  167. -               icon_name = "media-playback-start-symbolic";
  168. +               icon_name = "media-playback-start";
  169.             else
  170. -               icon_name = "media-playback-pause-symbolic";
  171. +               icon_name = "media-playback-pause";
  172.             totem_action_play_pause (totem);
  173.         }
  174.         break;
  175. @@ -3652,7 +3652,7 @@ totem_action_handle_key_press (TotemObje
  176.     case GDK_KEY_AudioPause:
  177.     case GDK_KEY_AudioStop:
  178.         totem_action_pause (totem);
  179. -       icon_name = "media-playback-pause-symbolic";
  180. +       icon_name = "media-playback-pause";
  181.         break;
  182.     case GDK_KEY_q:
  183.     case GDK_KEY_Q:
  184. @@ -3686,9 +3686,9 @@ totem_action_handle_key_press (TotemObje
  185.                 focus == GTK_WIDGET (totem->bvw) || focus == totem->seek) {
  186.                 if (event->keyval == GDK_KEY_space) {
  187.                     if (bacon_video_widget_is_playing (totem->bvw) == FALSE)
  188. -                       icon_name = "media-playback-start-symbolic";
  189. +                       icon_name = "media-playback-start";
  190.                     else
  191. -                       icon_name = "media-playback-pause-symbolic";
  192. +                       icon_name = "media-playback-pause";
  193.                     totem_action_play_pause (totem);
  194.                 } else if (bacon_video_widget_has_menus (totem->bvw) != FALSE) {
  195.                     bacon_video_widget_dvd_event (totem->bvw, BVW_DVD_ROOT_MENU_SELECT);
  196. @@ -3706,7 +3706,7 @@ totem_action_handle_key_press (TotemObje
  197.             /* Switch direction in RTL environment */
  198.             if (gtk_widget_get_direction (totem->win) == GTK_TEXT_DIR_RTL)
  199.                 is_forward = !is_forward;
  200. -           icon_name = is_forward ? "media-seek-forward-symbolic" : "media-seek-backward-symbolic";
  201. +           icon_name = is_forward ? "media-seek-forward" : "media-seek-backward";
  202.  
  203.             totem_action_handle_seek (totem, event, is_forward);
  204.         } else {
  205. @@ -3718,7 +3718,7 @@ totem_action_handle_key_press (TotemObje
  206.         break;
  207.     case GDK_KEY_Home:
  208.         totem_action_seek (totem, 0);
  209. -       icon_name = "media-seek-backward-symbolic";
  210. +       icon_name = "media-seek-backward";
  211.         break;
  212.     case GDK_KEY_Up:
  213.         if (bacon_video_widget_has_menus (totem->bvw) != FALSE)
  214. --- totem-3.0.1.orig/data/totem.ui
  215. +++ totem-3.0.1/data/totem.ui
  216. @@ -32,7 +32,7 @@
  217.           <child>
  218.              <object class="GtkAction" id="eject">
  219.                 <property name="label" translatable="yes">_Eject</property>
  220. -               <property name="icon-name">media-eject-symbolic</property>
  221. +               <property name="icon-name">media-eject</property>
  222.                 <property name="tooltip" translatable="yes">Eject the current disc</property>
  223.                 <signal name="activate" handler="eject_action_callback"/>
  224.              </object>
  225. @@ -50,7 +50,7 @@
  226.           <child>
  227.              <object class="GtkAction" id="play">
  228.                 <property name="label" translatable="yes">Play / P_ause</property>
  229. -               <property name="icon-name">media-playback-start-symbolic</property>
  230. +               <property name="icon-name">media-playback-start</property>
  231.                 <property name="tooltip" translatable="yes">Play or pause the movie</property>
  232.                 <signal name="activate" handler="play_action_callback"/>
  233.              </object>
  234. @@ -103,7 +103,7 @@
  235.           <child>
  236.              <object class="GtkAction" id="fullscreen">
  237.                 <property name="label" translatable="yes">_Fullscreen</property>
  238. -               <property name="icon-name">view-fullscreen-symbolic</property>
  239. +               <property name="icon-name">view-fullscreen</property>
  240.                 <property name="tooltip" translatable="yes">Switch to fullscreen</property>
  241.                 <signal name="activate" handler="fullscreen_action_callback"/>
  242.              </object>
  243. @@ -196,7 +196,7 @@
  244.           <child>
  245.              <object class="GtkAction" id="next-chapter">
  246.                 <property name="label" translatable="yes">_Next Chapter/Movie</property>
  247. -               <property name="icon-name">media-skip-forward-symbolic</property>
  248. +               <property name="icon-name">media-skip-forward</property>
  249.                 <property name="tooltip" translatable="yes">Next chapter or movie</property>
  250.                 <signal name="activate" handler="next_chapter_action_callback"/>
  251.              </object>
  252. @@ -205,7 +205,7 @@
  253.           <child>
  254.              <object class="GtkAction" id="previous-chapter">
  255.                 <property name="label" translatable="yes">_Previous Chapter/Movie</property>
  256. -               <property name="icon-name">media-skip-backward-symbolic</property>
  257. +               <property name="icon-name">media-skip-backward</property>
  258.                 <property name="tooltip" translatable="yes">Previous chapter or movie</property>
  259.                 <signal name="activate" handler="previous_chapter_action_callback"/>
  260.              </object>
  261. @@ -220,7 +220,7 @@
  262.           <child>
  263.              <object class="GtkAction" id="volume-up">
  264.                 <property name="label" translatable="yes">Volume _Up</property>
  265. -               <property name="icon-name">audio-volume-high-symbolic</property>
  266. +               <property name="icon-name">audio-volume-high</property>
  267.                 <property name="tooltip" translatable="yes">Increase volume</property>
  268.                 <signal name="activate" handler="volume_up_action_callback"/>
  269.              </object>
  270. @@ -229,7 +229,7 @@
  271.           <child>
  272.              <object class="GtkAction" id="volume-down">
  273.                 <property name="label" translatable="yes">Volume _Down</property>
  274. -               <property name="icon-name">audio-volume-low-symbolic</property>
  275. +               <property name="icon-name">audio-volume-low</property>
  276.                 <property name="tooltip" translatable="yes">Decrease volume</property>
  277.                 <signal name="activate" handler="volume_down_action_callback"/>
  278.              </object>
  279. @@ -289,7 +289,7 @@
  280.                 <property name="label" translatable="yes">S_idebar</property>
  281.                 <property name="tooltip" translatable="yes">Show or hide the sidebar</property>
  282.            <property name="active">TRUE</property>
  283. -          <property name="icon-name">view-sidebar-symbolic</property>
  284. +          <property name="icon-name">view-sidebar</property>
  285.                 <signal name="activate" handler="show_sidebar_action_callback"/>
  286.              </object>
  287.              <accelerator key="F9"/>
  288. @@ -401,7 +401,7 @@
  289.              <object class="GtkAction" id="skip-forward">
  290.                 <property name="label" translatable="yes">Skip _Forward</property>
  291.                 <property name="tooltip" translatable="yes">Skip forward</property>
  292. -               <property name="icon-name">media-seek-forward-symbolic</property>
  293. +               <property name="icon-name">media-seek-forward</property>
  294.                 <signal name="activate" handler="skip_forward_action_callback"/>
  295.              </object>
  296.              <accelerator key="Right"/>
  297. @@ -410,7 +410,7 @@
  298.              <object class="GtkAction" id="skip-backwards">
  299.                 <property name="label" translatable="yes">Skip _Backwards</property>
  300.                 <property name="tooltip" translatable="yes">Skip backwards</property>
  301. -               <property name="icon-name">media-seek-backward-symbolic</property>
  302. +               <property name="icon-name">media-seek-backward</property>
  303.                 <signal name="activate" handler="skip_backwards_action_callback"/>
  304.              </object>
  305.              <accelerator key="Left"/>
  306. @@ -2298,7 +2298,7 @@
  307.             <object class="GtkVolumeButton" id="tmw_volume_button">
  308.               <property name="visible">True</property>
  309.               <property name="sensitive">False</property>
  310. -             <property name="use-symbolic">True</property>
  311. +             <property name="use">True</property>
  312.               <signal name="value-changed" handler="volume_button_value_changed_cb"/>
  313.             </object>
  314.             <packing>
  315. --- totem-3.0.1.orig/data/mozilla-viewer.ui
  316. +++ totem-3.0.1/data/mozilla-viewer.ui
  317. @@ -106,7 +106,7 @@
  318.          <child>
  319.            <object class="GtkVolumeButton" id="volume_button">
  320.              <property name="visible">True</property>
  321. -       <property name="use-symbolic">True</property>
  322. +       <property name="use-symbolic">False</property>
  323.            </object>
  324.            <packing>
  325.              <property name="padding">0</property>
  326. --- totem-3.0.1.orig/data/playlist.ui
  327. +++ totem-3.0.1/data/playlist.ui
  328. @@ -102,7 +102,7 @@
  329.              <property name="can_focus">False</property>
  330.              <property name="use_action_appearance">False</property>
  331.              <property name="use_underline">True</property>
  332. -       <property name="icon_name">list-add-symbolic</property>
  333. +       <property name="icon_name">list-add</property>
  334.         <signal name="clicked" handler="totem_playlist_add_files"/>
  335.         <property name="tooltip-text" translatable="yes">Add...</property>
  336.            </object>
  337. @@ -117,7 +117,7 @@
  338.              <property name="can_focus">False</property>
  339.              <property name="use_action_appearance">False</property>
  340.              <property name="use_underline">True</property>
  341. -       <property name="icon_name">list-remove-symbolic</property>
  342. +       <property name="icon_name">list-remove</property>
  343.         <signal name="clicked" handler="playlist_remove_button_clicked"/>
  344.         <property name="tooltip-text" translatable="yes">Remove</property>
  345.            </object>
  346. @@ -132,7 +132,7 @@
  347.              <property name="can_focus">False</property>
  348.              <property name="use_action_appearance">False</property>
  349.              <property name="use_underline">True</property>
  350. -       <property name="icon_name">document-save-symbolic</property>
  351. +       <property name="icon_name">document-save</property>
  352.         <property name="tooltip-text" translatable="yes">Save Playlist...</property>
  353.         <signal name="clicked" handler="totem_playlist_save_files"/>
  354.            </object>
  355. @@ -147,7 +147,7 @@
  356.              <property name="can_focus">False</property>
  357.              <property name="use_action_appearance">False</property>
  358.              <property name="use_underline">True</property>
  359. -       <property name="icon_name">go-up-symbolic</property>
  360. +       <property name="icon_name">go-up</property>
  361.         <property name="tooltip-text" translatable="yes">Move Up</property>
  362.         <signal name="clicked" handler="totem_playlist_up_files"/>
  363.            </object>
  364. @@ -162,7 +162,7 @@
  365.              <property name="can_focus">False</property>
  366.              <property name="use_action_appearance">False</property>
  367.              <property name="use_underline">True</property>
  368. -       <property name="icon_name">go-down-symbolic</property>
  369. +       <property name="icon_name">go-down</property>
  370.         <property name="tooltip-text" translatable="yes">Move Down</property>
  371.         <signal name="clicked" handler="totem_playlist_down_files"/>
  372.            </object>
  373. --- totem-3.0.1.orig/data/fullscreen.ui
  374. +++ totem-3.0.1/data/fullscreen.ui
  375. @@ -252,7 +252,7 @@
  376.        <child>
  377.     <object class="GtkVolumeButton" id="tcw_volume_button">
  378.       <property name="visible">True</property>
  379. -     <property name="use-symbolic">True</property>
  380. +     <property name="use-symbolic">False</property>
  381.     </object>
  382.     <packing>
  383.       <property name="padding">0</property>
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!