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.
Revision | 510d1368b23e246b2cc7f6506c5222cec249b558 (tree) |
---|---|
Zeit | 2009-01-07 16:31:36 |
Autor | makeinu <makeinu@aeae...> |
Commiter | makeinu |
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
@@ -1,5 +1,7 @@ | ||
1 | 1 | 2008-12-02 Takuro Ashie <ashie@homa.ne.jp> |
2 | 2 | |
3 | +2008-12-02 Takuro Ashie <ashie@homa.ne.jp> | |
4 | + | |
3 | 5 | * src/gimv_prefs_win.c: Fix a crash bug. |
4 | 6 | |
5 | 7 | 2007-10-28 Takuro Ashie <ashie@homa.ne.jp> |
@@ -768,7 +768,8 @@ create_toolbar (GimvImageWin *iw, GtkWidget *container) | ||
768 | 768 | toolbar = gtkutil_create_toolbar (); |
769 | 769 | |
770 | 770 | /* 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); | |
772 | 773 | button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), |
773 | 774 | _("Open"), |
774 | 775 | _("File Open"), |
@@ -778,7 +779,8 @@ create_toolbar (GimvImageWin *iw, GtkWidget *container) | ||
778 | 779 | NULL); |
779 | 780 | |
780 | 781 | /* 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); | |
782 | 784 | button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), |
783 | 785 | _("Prefs"), |
784 | 786 | _("Preference"), |
@@ -790,7 +792,8 @@ create_toolbar (GimvImageWin *iw, GtkWidget *container) | ||
790 | 792 | gtk_toolbar_append_space (GTK_TOOLBAR (toolbar)); |
791 | 793 | |
792 | 794 | /* 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); | |
794 | 797 | button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), |
795 | 798 | _("Prev"), |
796 | 799 | _("Previous Image"), |
@@ -802,7 +805,8 @@ create_toolbar (GimvImageWin *iw, GtkWidget *container) | ||
802 | 805 | /* gtk_widget_set_sensitive (button, FALSE); */ |
803 | 806 | |
804 | 807 | /* 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); | |
806 | 810 | button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), |
807 | 811 | _("Next"), |
808 | 812 | _("Next Image"), |
@@ -816,7 +820,8 @@ create_toolbar (GimvImageWin *iw, GtkWidget *container) | ||
816 | 820 | gtk_toolbar_append_space (GTK_TOOLBAR (toolbar)); |
817 | 821 | |
818 | 822 | /* 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); | |
820 | 825 | button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), |
821 | 826 | _("No Zoom"), |
822 | 827 | _("No Zoom"), |
@@ -826,7 +831,8 @@ create_toolbar (GimvImageWin *iw, GtkWidget *container) | ||
826 | 831 | iw); |
827 | 832 | |
828 | 833 | /* 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); | |
830 | 836 | button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), |
831 | 837 | _("Zoom in"), |
832 | 838 | _("Zoom in"), |
@@ -836,7 +842,8 @@ create_toolbar (GimvImageWin *iw, GtkWidget *container) | ||
836 | 842 | iw); |
837 | 843 | |
838 | 844 | /* 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); | |
840 | 847 | button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), |
841 | 848 | _("Zoom out"), |
842 | 849 | _("Zoom out"), |
@@ -846,7 +853,8 @@ create_toolbar (GimvImageWin *iw, GtkWidget *container) | ||
846 | 853 | iw); |
847 | 854 | |
848 | 855 | /* 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); | |
850 | 858 | button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), |
851 | 859 | _("Zoom fit"), |
852 | 860 | _("Zoom fit"), |
@@ -887,7 +895,8 @@ create_toolbar (GimvImageWin *iw, GtkWidget *container) | ||
887 | 895 | iw->button.yscale = spinner; |
888 | 896 | |
889 | 897 | /* 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); | |
891 | 900 | button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), |
892 | 901 | _("Zoom"), |
893 | 902 | _("Zoom"), |
@@ -1504,7 +1504,8 @@ create_toolbar (GimvThumbWin *tw, GtkWidget *container) | ||
1504 | 1504 | toolbar = gtkutil_create_toolbar (); |
1505 | 1505 | |
1506 | 1506 | /* 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); | |
1508 | 1509 | button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), |
1509 | 1510 | _("Open"), |
1510 | 1511 | _("File Open"), |
@@ -1515,7 +1516,8 @@ create_toolbar (GimvThumbWin *tw, GtkWidget *container) | ||
1515 | 1516 | tw->button.fileopen = button; |
1516 | 1517 | |
1517 | 1518 | /* 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); | |
1519 | 1521 | button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), |
1520 | 1522 | _("Prefs"), |
1521 | 1523 | _("Preference"), |
@@ -1528,7 +1530,8 @@ create_toolbar (GimvThumbWin *tw, GtkWidget *container) | ||
1528 | 1530 | gtk_toolbar_append_space (GTK_TOOLBAR (toolbar)); |
1529 | 1531 | |
1530 | 1532 | /* 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); | |
1532 | 1535 | button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), |
1533 | 1536 | _("Prev"), |
1534 | 1537 | _("Go to previous page"), |
@@ -1539,7 +1542,8 @@ create_toolbar (GimvThumbWin *tw, GtkWidget *container) | ||
1539 | 1542 | tw->button.prev = button; |
1540 | 1543 | |
1541 | 1544 | /* 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); | |
1543 | 1547 | button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), |
1544 | 1548 | _("Next"), |
1545 | 1549 | _("Go to next page"), |
@@ -1552,7 +1556,8 @@ create_toolbar (GimvThumbWin *tw, GtkWidget *container) | ||
1552 | 1556 | gtk_toolbar_append_space (GTK_TOOLBAR (toolbar)); |
1553 | 1557 | |
1554 | 1558 | /* 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); | |
1556 | 1561 | button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), |
1557 | 1562 | _("Reload"), |
1558 | 1563 | _("Reload Cache"), |
@@ -1563,7 +1568,8 @@ create_toolbar (GimvThumbWin *tw, GtkWidget *container) | ||
1563 | 1568 | tw->button.refresh = button; |
1564 | 1569 | |
1565 | 1570 | /* 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); | |
1567 | 1573 | button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), |
1568 | 1574 | _("Skip"), |
1569 | 1575 | _("Skip creating current thumbnail table"), |
@@ -1575,7 +1581,8 @@ create_toolbar (GimvThumbWin *tw, GtkWidget *container) | ||
1575 | 1581 | tw->button.skip = button; |
1576 | 1582 | |
1577 | 1583 | /* 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); | |
1579 | 1586 | button = gtk_toolbar_append_item(GTK_TOOLBAR (toolbar), |
1580 | 1587 | _("Stop"), |
1581 | 1588 | _("Stop creating thumbnails"), |