• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
Keine Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

GImageView is a GTK+ based image viewer which supports tabbed browsing, thumbnail table views, directory tree views and drag and drop. It also support movies using the Xine library and MPlayer, and supports images in compressed archive formats.


Commit MetaInfo

Revision510d1368b23e246b2cc7f6506c5222cec249b558 (tree)
Zeit2009-01-07 16:31:36
Autormakeinu <makeinu@aeae...>
Commitermakeinu

Log Message

Use GTK's stock items for toolbar buttons.

git-svn-id: https://gtkmmviewer.svn.sourceforge.net/svnroot/gtkmmviewer/gimageview/trunk@1196 aeae0eed-423c-0410-9251-95fb8af3d19f

Ändern Zusammenfassung

Diff

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
11 2008-12-02 Takuro Ashie <ashie@homa.ne.jp>
22
3+2008-12-02 Takuro Ashie <ashie@homa.ne.jp>
4+
35 * src/gimv_prefs_win.c: Fix a crash bug.
46
57 2007-10-28 Takuro Ashie <ashie@homa.ne.jp>
--- a/src/gimv_image_win.c
+++ b/src/gimv_image_win.c
@@ -768,7 +768,8 @@ create_toolbar (GimvImageWin *iw, GtkWidget *container)
768768 toolbar = gtkutil_create_toolbar ();
769769
770770 /* file open button */
771- iconw = gimv_icon_stock_get_widget ("nfolder");
771+ iconw = gtk_image_new_from_stock(GTK_STOCK_OPEN,
772+ GTK_ICON_SIZE_SMALL_TOOLBAR);
772773 button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar),
773774 _("Open"),
774775 _("File Open"),
@@ -778,7 +779,8 @@ create_toolbar (GimvImageWin *iw, GtkWidget *container)
778779 NULL);
779780
780781 /* preference button */
781- iconw = gimv_icon_stock_get_widget ("prefs");
782+ iconw = gtk_image_new_from_stock(GTK_STOCK_PREFERENCES,
783+ GTK_ICON_SIZE_SMALL_TOOLBAR);
782784 button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar),
783785 _("Prefs"),
784786 _("Preference"),
@@ -790,7 +792,8 @@ create_toolbar (GimvImageWin *iw, GtkWidget *container)
790792 gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
791793
792794 /* prev button */
793- iconw = gimv_icon_stock_get_widget ("back");
795+ iconw = gtk_image_new_from_stock(GTK_STOCK_GO_BACK,
796+ GTK_ICON_SIZE_SMALL_TOOLBAR);
794797 button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar),
795798 _("Prev"),
796799 _("Previous Image"),
@@ -802,7 +805,8 @@ create_toolbar (GimvImageWin *iw, GtkWidget *container)
802805 /* gtk_widget_set_sensitive (button, FALSE); */
803806
804807 /* next button */
805- iconw = gimv_icon_stock_get_widget ("forward");
808+ iconw = gtk_image_new_from_stock(GTK_STOCK_GO_FORWARD,
809+ GTK_ICON_SIZE_SMALL_TOOLBAR);
806810 button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar),
807811 _("Next"),
808812 _("Next Image"),
@@ -816,7 +820,8 @@ create_toolbar (GimvImageWin *iw, GtkWidget *container)
816820 gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
817821
818822 /* no zoom button */
819- iconw = gimv_icon_stock_get_widget ("no_zoom");
823+ iconw = gtk_image_new_from_stock(GTK_STOCK_ZOOM_100,
824+ GTK_ICON_SIZE_SMALL_TOOLBAR);
820825 button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar),
821826 _("No Zoom"),
822827 _("No Zoom"),
@@ -826,7 +831,8 @@ create_toolbar (GimvImageWin *iw, GtkWidget *container)
826831 iw);
827832
828833 /* zoom in button */
829- iconw = gimv_icon_stock_get_widget ("zoom_in");
834+ iconw = gtk_image_new_from_stock(GTK_STOCK_ZOOM_IN,
835+ GTK_ICON_SIZE_SMALL_TOOLBAR);
830836 button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar),
831837 _("Zoom in"),
832838 _("Zoom in"),
@@ -836,7 +842,8 @@ create_toolbar (GimvImageWin *iw, GtkWidget *container)
836842 iw);
837843
838844 /* zoom out button */
839- iconw = gimv_icon_stock_get_widget ("zoom_out");
845+ iconw = gtk_image_new_from_stock(GTK_STOCK_ZOOM_OUT,
846+ GTK_ICON_SIZE_SMALL_TOOLBAR);
840847 button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar),
841848 _("Zoom out"),
842849 _("Zoom out"),
@@ -846,7 +853,8 @@ create_toolbar (GimvImageWin *iw, GtkWidget *container)
846853 iw);
847854
848855 /* zoom fit button */
849- iconw = gimv_icon_stock_get_widget ("zoom_fit");
856+ iconw = gtk_image_new_from_stock(GTK_STOCK_ZOOM_FIT,
857+ GTK_ICON_SIZE_SMALL_TOOLBAR);
850858 button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar),
851859 _("Zoom fit"),
852860 _("Zoom fit"),
@@ -887,7 +895,8 @@ create_toolbar (GimvImageWin *iw, GtkWidget *container)
887895 iw->button.yscale = spinner;
888896
889897 /* zoom button */
890- iconw = gimv_icon_stock_get_widget ("zoom");
898+ iconw = gtk_image_new_from_stock(GTK_STOCK_OK,
899+ GTK_ICON_SIZE_SMALL_TOOLBAR);
891900 button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar),
892901 _("Zoom"),
893902 _("Zoom"),
--- a/src/gimv_thumb_win.c
+++ b/src/gimv_thumb_win.c
@@ -1504,7 +1504,8 @@ create_toolbar (GimvThumbWin *tw, GtkWidget *container)
15041504 toolbar = gtkutil_create_toolbar ();
15051505
15061506 /* file open button */
1507- iconw = gimv_icon_stock_get_widget ("nfolder");
1507+ iconw = gtk_image_new_from_stock(GTK_STOCK_OPEN,
1508+ GTK_ICON_SIZE_SMALL_TOOLBAR);
15081509 button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar),
15091510 _("Open"),
15101511 _("File Open"),
@@ -1515,7 +1516,8 @@ create_toolbar (GimvThumbWin *tw, GtkWidget *container)
15151516 tw->button.fileopen = button;
15161517
15171518 /* preference button */
1518- iconw = gimv_icon_stock_get_widget ("prefs");
1519+ iconw = gtk_image_new_from_stock(GTK_STOCK_PREFERENCES,
1520+ GTK_ICON_SIZE_SMALL_TOOLBAR);
15191521 button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar),
15201522 _("Prefs"),
15211523 _("Preference"),
@@ -1528,7 +1530,8 @@ create_toolbar (GimvThumbWin *tw, GtkWidget *container)
15281530 gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
15291531
15301532 /* previous button */
1531- iconw = gimv_icon_stock_get_widget ("leftarrow");
1533+ iconw = gtk_image_new_from_stock(GTK_STOCK_GO_BACK,
1534+ GTK_ICON_SIZE_SMALL_TOOLBAR);
15321535 button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar),
15331536 _("Prev"),
15341537 _("Go to previous page"),
@@ -1539,7 +1542,8 @@ create_toolbar (GimvThumbWin *tw, GtkWidget *container)
15391542 tw->button.prev = button;
15401543
15411544 /* next button */
1542- iconw = gimv_icon_stock_get_widget ("rightarrow");
1545+ iconw = gtk_image_new_from_stock(GTK_STOCK_GO_FORWARD,
1546+ GTK_ICON_SIZE_SMALL_TOOLBAR);
15431547 button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar),
15441548 _("Next"),
15451549 _("Go to next page"),
@@ -1552,7 +1556,8 @@ create_toolbar (GimvThumbWin *tw, GtkWidget *container)
15521556 gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
15531557
15541558 /* refresh button */
1555- iconw = gimv_icon_stock_get_widget ("refresh");
1559+ iconw = gtk_image_new_from_stock(GTK_STOCK_REFRESH,
1560+ GTK_ICON_SIZE_SMALL_TOOLBAR);
15561561 button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar),
15571562 _("Reload"),
15581563 _("Reload Cache"),
@@ -1563,7 +1568,8 @@ create_toolbar (GimvThumbWin *tw, GtkWidget *container)
15631568 tw->button.refresh = button;
15641569
15651570 /* skip button */
1566- iconw = gimv_icon_stock_get_widget ("skip");
1571+ iconw = gtk_image_new_from_stock(GTK_STOCK_GOTO_LAST,
1572+ GTK_ICON_SIZE_SMALL_TOOLBAR);
15671573 button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar),
15681574 _("Skip"),
15691575 _("Skip creating current thumbnail table"),
@@ -1575,7 +1581,8 @@ create_toolbar (GimvThumbWin *tw, GtkWidget *container)
15751581 tw->button.skip = button;
15761582
15771583 /* stop button */
1578- iconw = gimv_icon_stock_get_widget ("stop");
1584+ iconw = gtk_image_new_from_stock(GTK_STOCK_STOP,
1585+ GTK_ICON_SIZE_SMALL_TOOLBAR);
15791586 button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar),
15801587 _("Stop"),
15811588 _("Stop creating thumbnails"),