Menu
▾
▴
enlightenment-cvs
|
From: <enl...@li...> - 2006-01-16 12:59:49
|
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/exhibit/src/bin Modified Files: Makefile.am Log Message: fix typo =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/exhibit/src/bin/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- Makefile.am 6 Jan 2006 14:38:34 -0000 1.6 +++ Makefile.am 16 Jan 2006 12:59:42 -0000 1.7 @@ -32,6 +32,6 @@ exhibit_slideshow.c \ exhibit_favorites.c \ exhibit_options.c \ -$(exhibit_includes) +$(exhibit_INCLUDES) exhibit_LDADD = @my_libs@ |
|
From: <enl...@li...> - 2006-01-17 10:16:51
|
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_filechooser_widget.c etk_filechooser_widget.h
Log Message:
- patch from yiyus <yi...@sp...> to allow the file chooser to use a file with the same format as ~/.gtk-bookmarks. Had to modify it a bit as it was against an old version of Etk, and made it so that the dirs displayed in the favirites folder look better. Moom: so we need to free the data associated with an Etk_Tree_Row?
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_filechooser_widget.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- etk_filechooser_widget.c 15 Jan 2006 11:07:16 -0000 1.4
+++ etk_filechooser_widget.c 17 Jan 2006 10:16:42 -0000 1.5
@@ -42,7 +42,9 @@
static void _etk_filechooser_widget_destructor(Etk_Filechooser_Widget *filechooser_widget);
static void _etk_filechooser_widget_property_set(Etk_Object *object, int property_id, Etk_Property_Value *value);
static void _etk_filechooser_widget_property_get(Etk_Object *object, int property_id, Etk_Property_Value *value);
+static void _etk_filechooser_widget_favs_get(Etk_Filechooser_Widget *filechooser_widget);
static void _etk_filechooser_widget_dir_row_selected_cb(Etk_Object *object, Etk_Tree_Row *row, void *data);
+static void _etk_filechooser_widget_fav_row_selected_cb(Etk_Object *object, Etk_Tree_Row *row, void *data);
static Etk_Filechooser_Widget_Icons _etk_file_chooser_icons[] =
{
@@ -97,8 +99,8 @@
}
/**
- * @brief Creates a new status bar
- * @return Returns the new status bar widget
+ * @brief Creates a new file chooser widget
+ * @return Returns the new file chooser widget
*/
Etk_Widget *etk_filechooser_widget_new()
{
@@ -236,11 +238,7 @@
etk_tree_build(ETK_TREE(fcw->fav_tree));
etk_widget_show(fcw->fav_tree);
- etk_tree_append(ETK_TREE(fcw->fav_tree), fcw->fav_col, etk_theme_icon_theme_get(), "devices/drive-harddisk_16", "Root", NULL);
- etk_tree_append(ETK_TREE(fcw->fav_tree), fcw->fav_col, etk_theme_icon_theme_get(), "places/user-home_16", "Home", NULL);
- etk_tree_append(ETK_TREE(fcw->fav_tree), fcw->fav_col, etk_theme_icon_theme_get(), "places/folder_16", "Musics", NULL);
- etk_tree_append(ETK_TREE(fcw->fav_tree), fcw->fav_col, etk_theme_icon_theme_get(), "places/folder_16", "Videos", NULL);
- etk_tree_append(ETK_TREE(fcw->fav_tree), fcw->fav_col, etk_theme_icon_theme_get(), "places/folder_16", "Images", NULL);
+ etk_signal_connect("row_selected", ETK_OBJECT(fcw->fav_tree), ETK_CALLBACK(_etk_filechooser_widget_fav_row_selected_cb), fcw);
fcw->files_tree = etk_tree_new();
etk_widget_visibility_locked_set(fcw->files_tree, ETK_TRUE);
@@ -251,7 +249,8 @@
fcw->files_date_col = etk_tree_col_new(ETK_TREE(fcw->files_tree), "Date", etk_tree_model_text_new(ETK_TREE(fcw->files_tree)), 60);
etk_tree_build(ETK_TREE(fcw->files_tree));
etk_widget_show(fcw->files_tree);
-
+
+ _etk_filechooser_widget_favs_get(ETK_FILECHOOSER_WIDGET(fcw));
fcw->current_folder = NULL;
/* Go to home */
@@ -302,6 +301,41 @@
}
}
+/* Get favorites from file in ~/ETK_FILECHOOSER_FAVS */
+static void _etk_filechooser_widget_favs_get(Etk_Filechooser_Widget *filechooser_widget)
+{
+ char *folder;
+ char file_path[PATH_MAX];
+ char fav[PATH_MAX];
+ char line[PATH_MAX];
+ FILE *f;
+
+ if (!filechooser_widget)
+ return;
+ if (!(folder = getenv("HOME")))
+ return;
+
+ snprintf(file_path, sizeof(file_path), "%s/%s", folder, ETK_FILECHOOSER_FAVS);
+
+ if((f = fopen (file_path, "r")) == NULL)
+ return;
+
+ etk_tree_freeze(ETK_TREE(filechooser_widget->fav_tree));
+ etk_tree_clear(ETK_TREE(filechooser_widget->fav_tree));
+
+ while(fgets(line, PATH_MAX, f) != NULL)
+ {
+ Etk_Tree_Row *row;
+ sscanf(line,"file://%s",fav);
+ row = etk_tree_append(ETK_TREE(filechooser_widget->fav_tree),
+ filechooser_widget->fav_col, etk_theme_icon_theme_get(), "places/folder_16", ecore_file_get_file(fav), NULL);
+ etk_tree_row_data_set(row, (void*)strdup(fav)); /* any special things to do here to free? */
+ }
+
+ fclose (f);
+ etk_tree_thaw(ETK_TREE(filechooser_widget->fav_tree));
+}
+
/**************************
*
* Callbacks and handlers
@@ -325,6 +359,19 @@
free(new_dir);
}
+static void _etk_filechooser_widget_fav_row_selected_cb(Etk_Object *object, Etk_Tree_Row *row, void *data)
+{
+ Etk_Filechooser_Widget *filechooser_widget;
+ char *selected_dir;
+
+ if (!(filechooser_widget = ETK_FILECHOOSER_WIDGET(data)))
+ return;
+
+ selected_dir = etk_tree_row_data_get(row);
+ etk_filechooser_widget_current_folder_set(filechooser_widget, selected_dir);
+
+}
+
/**************************
*
* Private functions
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_filechooser_widget.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_filechooser_widget.h 2 Dec 2005 21:57:55 -0000 1.1
+++ etk_filechooser_widget.h 17 Jan 2006 10:16:44 -0000 1.2
@@ -5,6 +5,8 @@
#include <Evas.h>
#include "etk_bin.h"
#include "etk_types.h"
+#include <limits.h>
+
/**
* @defgroup Etk_Filechooser_Widget Etk_Filechooser_Widget
@@ -17,6 +19,8 @@
#define ETK_FILECHOOSER_WIDGET(obj) (ETK_OBJECT_CAST((obj), ETK_FILECHOOSER_WIDGET_TYPE, Etk_Filechooser_Widget))
/** @brief Checks if the object is an Etk_Filechooser_Widget */
#define ETK_IS_FILECHOOSER_WIDGET(obj) (ETK_OBJECT_CHECK_TYPE((obj), ETK_FILECHOOSER_WIDGET_TYPE))
+/** @brief Default path for bookmarks */
+#define ETK_FILECHOOSER_FAVS ".gtk-bookmarks"
/**
* @struct Etk_Filechooser_Widget
@@ -36,7 +40,7 @@
Etk_Widget *files_tree;
Etk_Tree_Col *files_name_col;
- Etk_Tree_Col *files_date_col;
+ Etk_Tree_Col *files_date_col;
char *current_folder;
};
@@ -46,6 +50,7 @@
void etk_filechooser_widget_current_folder_set(Etk_Filechooser_Widget *filechooser_widget, const char *folder);
+
/** @} */
#endif
|
|
From: <enl...@li...> - 2006-01-19 01:48:46
|
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_stock.c etk_stock.h
Log Message:
- get the rest of the stocks in, its a matter of writing the descriptions now.
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_stock.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- etk_stock.c 15 Jan 2006 11:07:16 -0000 1.5
+++ etk_stock.c 19 Jan 2006 01:48:34 -0000 1.6
@@ -18,7 +18,7 @@
static const Etk_Stock_Item _etk_stock_items[] =
{
- { NULL, NULL },
+/*
{ "actions/process-stop_16", "actions/process-stop_22", "actions/process-stop_48", "Stop" },
{ "actions/document-open_16", "actions/document-open_22", "actions/document-open_48", "Open" },
{ "actions/document-save_16", "actions/document-save_22", "actions/document-save_48", "Save" },
@@ -29,6 +29,158 @@
{ "actions/process-stop_16", "actions/process-stop_22", "actions/process-stop_48", "Cancel" },
{ "actions/go-up_16", "actions/go-up_22", "actions/go-up_48", "Go Up" },
{ "actions/go-down_16", "actions/go-down_22", "actions/go-down_48", "Go Down" },
+*/
+ { NULL, NULL },
+ { "actions/address-book-new_16", "actions/address-book-new_22", "actions/address-book-new_48", "" },
+ { "actions/appointment-new_16", "actions/appointment-new_22", "actions/appointment-new_48", "" },
+ { "actions/bookmark-new_16", "actions/bookmark-new_22", "actions/bookmark-new_48", "" },
+ { "actions/contact-new_16", "actions/contact-new_22", "actions/contact-new_48", "" },
+ { "actions/dialog-cancel_16", "actions/dialog-cancel_22", "actions/dialog-cancel_48", "Cancel" },
+ { "actions/directory-new_16", "actions/directory-new_22", "actions/directory-new_48", "" },
+ { "actions/document-new_16", "actions/document-new_22", "actions/document-new_48", "New" },
+ { "actions/document-open_16", "actions/document-open_22", "actions/document-open_48", "Open" },
+ { "actions/document-print_16", "actions/document-print_22", "actions/document-print_48", "Print" },
+ { "actions/document-print-preview_16", "actions/document-print-preview_22", "actions/document-print-preview_48", "Print Preview" },
+ { "actions/document-properties_16", "actions/document-properties_22", "actions/document-properties_48", "Properties" },
+ { "actions/document-save-as_16", "actions/document-save-as_22", "actions/document-save-as_48", "Save as" },
+ { "actions/document-save_16", "actions/document-save_22", "actions/document-save_48", "Save" },
+ { "actions/edit-clear_16", "actions/edit-clear_22", "actions/edit-clear_48", "Clear" },
+ { "actions/edit-copy_16", "actions/edit-copy_22", "actions/edit-copy_48", "Copy" },
+ { "actions/edit-cut_16", "actions/edit-cut_22", "actions/edit-cut_48", "Cut" },
+ { "actions/edit-find_16", "actions/edit-find_22", "actions/edit-find_48", "Find" },
+ { "actions/edit-paste_16", "actions/edit-paste_22", "actions/edit-paste_48", "Paste" },
+ { "actions/edit-redo_16", "actions/edit-redo_22", "actions/edit-redo_48", "Redo" },
+ { "actions/edit-undo_16", "actions/edit-undo_22", "actions/edit-undo_48", "Undo" },
+ { "actions/format-indent-less_16", "actions/format-indent-less_22", "actions/format-indent-less_48", "" },
+ { "actions/format-indent-more_16", "actions/format-indent-more_22", "actions/format-indent-more_48", "" },
+ { "actions/format-justify-center_16", "actions/format-justify-center_22", "actions/format-justify-center_48", "" },
+ { "actions/format-justify-fill_16", "actions/format-justify-fill_22", "actions/format-justify-fill_48", "" },
+ { "actions/format-justify-left_16", "actions/format-justify-left_22", "actions/format-justify-left_48", "" },
+ { "actions/format-justify-right_16", "actions/format-justify-right_22", "actions/format-justify-right_48", "" },
+ { "actions/format-text-bold_16", "actions/format-text-bold_22", "actions/format-text-bold_48", "Bold" },
+ { "actions/format-text-italic_16", "actions/format-text-italic_22", "actions/format-text-italic_48", "Italic" },
+ { "actions/format-text-strikethrough_16", "actions/format-text-strikethrough_22", "actions/format-text-strikethrough_48", "Strike Through" },
+ { "actions/format-text-underline_16", "actions/format-text-underline_22", "actions/format-text-underline_48", "Underline" },
+ { "actions/go-bottom_16", "actions/go-bottom_22", "actions/go-bottom_48", "Bottom" },
+ { "actions/go-down_16", "actions/go-down_22", "actions/go-down_48", "Go Down" },
+ { "actions/go-first_16", "actions/go-first_22", "actions/go-first_48", "First" },
+ { "actions/go-home_16", "actions/go-home_22", "actions/go-home_48", "Home" },
+ { "actions/go-jump_16", "actions/go-jump_22", "actions/go-jump_48", "Jump" },
+ { "actions/go-last_16", "actions/go-last_22", "actions/go-last_48", "Last" },
+ { "actions/go-next_16", "actions/go-next_22", "actions/go-next_48", "Next" },
+ { "actions/go-previous_16", "actions/go-previous_22", "actions/go-previous_48", "Previous" },
+ { "actions/go-top_16", "actions/go-top_22", "actions/go-top_48", "Top" },
+ { "actions/go-up_16", "actions/go-up_22", "actions/go-up_48", "Go Up" },
+ { "actions/help-contents_16", "actions/help-contents_22", "actions/help-contents_48", "" },
+ { "actions/mail-message-new_16", "actions/mail-message-new_22", "actions/mail-message-new_48", "" },
+ { "actions/media-playback-pause_16", "actions/media-playback-pause_22", "actions/media-playback-pause_48", "" },
+ { "actions/media-playback-start_16", "actions/media-playback-start_22", "actions/media-playback-start_48", "" },
+ { "actions/media-playback-stop_16", "actions/media-playback-stop_22", "actions/media-playback-stop_48", "" },
+ { "actions/media-record_16", "actions/media-record_22", "actions/media-record_48", "" },
+ { "actions/media-seek-backward_16", "actions/media-seek-backward_22", "actions/media-seek-backward_48", "" },
+ { "actions/media-seek-forward_16", "actions/media-seek-forward_22", "actions/media-seek-forward_48", "" },
+ { "actions/media-skip-backward_16", "actions/media-skip-backward_22", "actions/media-skip-backward_48", "" },
+ { "actions/media-skip-forward_16", "actions/media-skip-forward_22", "actions/media-skip-forward_48", "" },
+ { "actions/process-stop_16", "actions/process-stop_22", "actions/process-stop_48", "Stop" },
+ { "actions/system-log-out_16", "actions/system-log-out_22", "actions/system-log-out_48", "Log out" },
+ { "actions/system-search_16", "actions/system-search_22", "actions/system-search_48", "Search" },
+ { "actions/system-shutdown_16", "actions/system-shutdown_22", "actions/system-shutdown_48", "Shutdown" },
+ { "actions/tab-new_16", "actions/tab-new_22", "actions/tab-new_48", "New Tab" },
+ { "actions/view-refresh_16", "actions/view-refresh_22", "actions/view-refresh_48", "Refresh" },
+ { "actions/window-new_16", "actions/window-new_22", "actions/window-new_48", "New Window" },
+ { "apps/accessories-calculator_16", "apps/accessories-calculator_22", "apps/accessories-calculator_48", "" },
+ { "apps/accessories-text-editor_16", "apps/accessories-text-editor_22", "apps/accessories-text-editor_48", "" },
+ { "apps/help-browser_16", "apps/help-browser_22", "apps/help-browser_48", "" },
+ { "apps/internet-group-chat_16", "apps/internet-group-chat_22", "apps/internet-group-chat_48", "" },
+ { "apps/internet-mail_16", "apps/internet-mail_22", "apps/internet-mail_48", "" },
+ { "apps/internet-news-reader_16", "apps/internet-news-reader_22", "apps/internet-news-reader_48", "" },
+ { "apps/internet-web-browser_16", "apps/internet-web-browser_22", "apps/internet-web-browser_48", "" },
+ { "apps/multimedia-volume-control_16", "apps/multimedia-volume-control_22", "apps/multimedia-volume-control_48", "" },
+ { "apps/office-calendar_16", "apps/office-calendar_22", "apps/office-calendar_48", "" },
+ { "apps/preferences-desktop-accessibility_16", "apps/preferences-desktop-accessibility_22", "apps/preferences-desktop-accessibility_48", "" },
+ { "apps/preferences-desktop-font_16", "apps/preferences-desktop-font_22", "apps/preferences-desktop-font_48", "" },
+ { "apps/preferences-desktop-screensaver_16", "apps/preferences-desktop-screensaver_22", "apps/preferences-desktop-screensaver_48", "" },
+ { "apps/preferences-desktop-theme_16", "apps/preferences-desktop-theme_22", "apps/preferences-desktop-theme_48", "" },
+ { "apps/preferences-desktop-wallpaper_16", "apps/preferences-desktop-wallpaper_22", "apps/preferences-desktop-wallpaper_48", "" },
+ { "apps/preferences-system-session_16", "apps/preferences-system-session_22", "apps/preferences-system-session_48", "" },
+ { "apps/preferences-system-windows_16", "apps/preferences-system-windows_22", "apps/preferences-system-windows_48", "" },
+ { "apps/system-file-manager_16", "apps/system-file-manager_22", "apps/system-file-manager_48", "" },
+ { "apps/system-installer_16", "apps/system-installer_22", "apps/system-installer_48", "" },
+ { "apps/system-lock-screen_16", "apps/system-lock-screen_22", "apps/system-lock-screen_48", "" },
+ { "apps/system-software-update_16", "apps/system-software-update_22", "apps/system-software-update_48", "" },
+ { "apps/system-users_16", "apps/system-users_22", "apps/system-users_48", "" },
+ { "apps/utilities-system-monitor_16", "apps/utilities-system-monitor_22", "apps/utilities-system-monitor_48", "" },
+ { "apps/utilities-terminal_16", "apps/utilities-terminal_22", "apps/utilities-terminal_48", "" },
+ { "categories/applications-development_16", "categories/applications-development_22", "categories/applications-development_48", "" },
+ { "categories/applications-games_16", "categories/applications-games_22", "categories/applications-games_48", "" },
+ { "categories/preferences-desktop_16", "categories/preferences-desktop_22", "categories/preferences-desktop_48", "" },
+ { "devices/audio-card_16", "devices/audio-card_22", "devices/audio-card_48", "" },
+ { "devices/audio-input-microphone_16", "devices/audio-input-microphone_22", "devices/audio-input-microphone_48", "" },
+ { "devices/battery_16", "devices/battery_22", "devices/battery_48", "" },
+ { "devices/camera-photo_16", "devices/camera-photo_22", "devices/camera-photo_48", "" },
+ { "devices/camera-video_16", "devices/camera-video_22", "devices/camera-video_48", "" },
+ { "devices/computer_16", "devices/computer_22", "devices/computer_48", "" },
+ { "devices/drive-cdrom_16", "devices/drive-cdrom_22", "devices/drive-cdrom_48", "" },
+ { "devices/drive-harddisk_16", "devices/drive-harddisk_22", "devices/drive-harddisk_48", "" },
+ { "devices/drive-removable-media_16", "devices/drive-removable-media_22", "devices/drive-removable-media_48", "" },
+ { "devices/input-gaming_16", "devices/input-gaming_22", "devices/input-gaming_48", "" },
+ { "devices/input-keyboard_16", "devices/input-keyboard_22", "devices/input-keyboard_48", "" },
+ { "devices/input-mouse_16", "devices/input-mouse_22", "devices/input-mouse_48", "" },
+ { "devices/media-cdrom_16", "devices/media-cdrom_22", "devices/media-cdrom_48", "" },
+ { "devices/media-floppy_16", "devices/media-floppy_22", "devices/media-floppy_48", "" },
+ { "devices/network_16", "devices/network_22", "devices/network_48", "" },
+ { "devices/network-wireless_16", "devices/network-wireless_22", "devices/network-wireless_48", "" },
+ { "devices/printer_16", "devices/printer_22", "devices/printer_48", "" },
+ { "devices/printer-remote_16", "devices/printer-remote_22", "devices/printer-remote_48", "" },
+ { "devices/video-display_16", "devices/video-display_22", "devices/video-display_48", "" },
+ { "emblems/emblem-favorites_16", "emblems/emblem-favorites_22", "emblems/emblem-favorites_48", "" },
+ { "emblems/emblem-important_16", "emblems/emblem-important_22", "emblems/emblem-important_48", "" },
+ { "emblems/emblem-photos_16", "emblems/emblem-photos_22", "emblems/emblem-photos_48", "" },
+ { "emblems/emblem-symbolic-link_16", "emblems/emblem-symbolic-link_22", "emblems/emblem-symbolic-link_48", "" },
+ { "emblems/emblem-system_16", "emblems/emblem-system_22", "emblems/emblem-system_48", "" },
+ { "emotes/face-angel_16", "emotes/face-angel_22", "emotes/face-angel_48", "" },
+ { "emotes/face-crying_16", "emotes/face-crying_22", "emotes/face-crying_48", "" },
+ { "emotes/face-devil-grin_16", "emotes/face-devil-grin_22", "emotes/face-devil-grin_48", "" },
+ { "emotes/face-glasses_16", "emotes/face-glasses_22", "emotes/face-glasses_48", "" },
+ { "emotes/face-grin_16", "emotes/face-grin_22", "emotes/face-grin_48", "" },
+ { "emotes/face-sad_16", "emotes/face-sad_22", "emotes/face-sad_48", "" },
+ { "emotes/face-smile-big_16", "emotes/face-smile-big_22", "emotes/face-smile-big_48", "" },
+ { "emotes/face-smile_16", "emotes/face-smile_22", "emotes/face-smile_48", "" },
+ { "emotes/face-surprise_16", "emotes/face-surprise_22", "emotes/face-surprise_48", "" },
+ { "emotes/face-wink_16", "emotes/face-wink_22", "emotes/face-wink_48", "" },
+ { "mimetypes/application-certificate_16", "mimetypes/application-certificate_22", "mimetypes/application-certificate_48", "" },
+ { "mimetypes/application-x-executable_16", "mimetypes/application-x-executable_22", "mimetypes/application-x-executable_48", "" },
+ { "mimetypes/audio-x-generic_16", "mimetypes/audio-x-generic_22", "mimetypes/audio-x-generic_48", "" },
+ { "mimetypes/image-x-generic_16", "mimetypes/image-x-generic_22", "mimetypes/image-x-generic_48", "" },
+ { "mimetypes/package-x-generic_16", "mimetypes/package-x-generic_22", "mimetypes/package-x-generic_48", "" },
+ { "mimetypes/text-html_16", "mimetypes/text-html_22", "mimetypes/text-html_48", "" },
+ { "mimetypes/text-x-generic_16", "mimetypes/text-x-generic_22", "mimetypes/text-x-generic_48", "" },
+ { "mimetypes/text-x-generic-template_16", "mimetypes/text-x-generic-template_22", "mimetypes/text-x-generic-template_48", "" },
+ { "mimetypes/text-x-script_16", "mimetypes/text-x-script_22", "mimetypes/text-x-script_48", "" },
+ { "mimetypes/video-x-generic_16", "mimetypes/video-x-generic_22", "mimetypes/video-x-generic_48", "" },
+ { "mimetypes/x-directory-desktop_16", "mimetypes/x-directory-desktop_22", "mimetypes/x-directory-desktop_48", "" },
+ { "mimetypes/x-directory-normal-drag-accept_16", "mimetypes/x-directory-normal-drag-accept_22", "mimetypes/x-directory-normal-drag-accept_48", "" },
+ { "mimetypes/x-directory-normal-home_16", "mimetypes/x-directory-normal-home_22", "mimetypes/x-directory-normal-home_48", "" },
+ { "mimetypes/x-directory-normal-open_16", "mimetypes/x-directory-normal-open_22", "mimetypes/x-directory-normal-open_48", "" },
+ { "mimetypes/x-directory-normal_16", "mimetypes/x-directory-normal_22", "mimetypes/x-directory-normal_48", "" },
+ { "mimetypes/x-directory-normal-visiting_16", "mimetypes/x-directory-normal-visiting_22", "mimetypes/x-directory-normal-visiting_48", "" },
+ { "mimetypes/x-directory-remote_16", "mimetypes/x-directory-remote_22", "mimetypes/x-directory-remote_48", "" },
+ { "mimetypes/x-directory-remote-server_16", "mimetypes/x-directory-remote-server_22", "mimetypes/x-directory-remote-server_48", "" },
+ { "mimetypes/x-directory-remote-workgroup_16", "mimetypes/x-directory-remote-workgroup_22", "mimetypes/x-directory-remote-workgroup_48", "" },
+ { "mimetypes/x-directory-trash-full_16", "mimetypes/x-directory-trash-full_22", "mimetypes/x-directory-trash-full_48", "" },
+ { "mimetypes/x-directory-trash_16", "mimetypes/x-directory-trash_22", "mimetypes/x-directory-trash_48", "" },
+ { "mimetypes/x-office-address-book_16", "mimetypes/x-office-address-book_22", "mimetypes/x-office-address-book_48", "" },
+ { "mimetypes/x-office-document_16", "mimetypes/x-office-document_22", "mimetypes/x-office-document_48", "" },
+ { "mimetypes/x-office-spreadsheet_16", "mimetypes/x-office-spreadsheet_22", "mimetypes/x-office-spreadsheet_48", "" },
+ { "status/battery-caution_16", "status/battery-caution_22", "status/battery-caution_48", "" },
+ { "status/dialog-error_16", "status/dialog-error_22", "status/dialog-error_48", "" },
+ { "status/dialog-information_16", "status/dialog-information_22", "status/dialog-information_48", "" },
+ { "status/dialog-warning_16", "status/dialog-warning_22", "status/dialog-warning_48", "" },
+ { "status/image-loading_16", "status/image-loading_22", "status/image-loading_48", "" },
+ { "status/image-missing_16", "status/image-missing_22", "status/image-missing_48", "" },
+ { "status/locked_16", "status/locked_22", "status/locked_48", "" },
+ { "status/mail-attachment_16", "status/mail-attachment_22", "status/mail-attachment_48", "" },
+ { "status/unlocked_16", "status/unlocked_22", "status/unlocked_48", "" }
};
/**************************
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_stock.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- etk_stock.h 15 Jan 2006 11:07:16 -0000 1.5
+++ etk_stock.h 19 Jan 2006 01:48:34 -0000 1.6
@@ -19,17 +19,157 @@
/* TODO: doc */
enum _Etk_Stock_Id
{
- ETK_STOCK_NO_STOCK,
- ETK_STOCK_PROCESS_STOP,
+ ETK_STOCK_NO_STOCK,
+ ETK_STOCK_ADDRESS_BOOK_NEW,
+ ETK_STOCK_APPOINTMENT_NEW,
+ ETK_STOCK_BOOKMARK_NEW,
+ ETK_STOCK_CONTACT_NEW,
+ ETK_STOCK_DIALOG_CANCEL,
+ ETK_STOCK_DIRECTORY_NEW,
+ ETK_STOCK_DOCUMENT_NEW,
ETK_STOCK_DOCUMENT_OPEN,
- ETK_STOCK_DOCUMENT_SAVE,
+ ETK_STOCK_DOCUMENT_PRINT,
+ ETK_STOCK_DOCUMENT_PRINT_PREVIEW,
+ ETK_STOCK_DOCUMENT_PROPERTIES,
ETK_STOCK_DOCUMENT_SAVE_AS,
- ETK_STOCK_EDIT_CUT,
+ ETK_STOCK_DOCUMENT_SAVE,
+ ETK_STOCK_EDIT_CLEAR,
ETK_STOCK_EDIT_COPY,
+ ETK_STOCK_EDIT_CUT,
+ ETK_STOCK_EDIT_FIND,
ETK_STOCK_EDIT_PASTE,
- ETK_STOCK_DIALOG_CANCEL,
- ETK_STOCK_GO_UP,
+ ETK_STOCK_EDIT_REDO,
+ ETK_STOCK_EDIT_UNDO,
+ ETK_STOCK_FORMAT_INDENT_LESS,
+ ETK_STOCK_FORMAT_INDENT_MORE,
+ ETK_STOCK_FORMAT_JUSTIFY_CENTER,
+ ETK_STOCK_FORMAT_JUSTIFY_FILL,
+ ETK_STOCK_FORMAT_JUSTIFY_LEFT,
+ ETK_STOCK_FORMAT_JUSTIFY_RIGHT,
+ ETK_STOCK_FORMAT_TEXT_BOLD,
+ ETK_STOCK_FORMAT_TEXT_ITALIC,
+ ETK_STOCK_FORMAT_TEXT_STRIKETHROUGH,
+ ETK_STOCK_FORMAT_TEXT_UNDERLINE,
+ ETK_STOCK_GO_BOTTOM,
ETK_STOCK_GO_DOWN,
+ ETK_STOCK_GO_FIRST,
+ ETK_STOCK_GO_HOME,
+ ETK_STOCK_GO_JUMP,
+ ETK_STOCK_GO_LAST,
+ ETK_STOCK_GO_NEXT,
+ ETK_STOCK_GO_PREVIOUS,
+ ETK_STOCK_GO_TOP,
+ ETK_STOCK_GO_UP,
+ ETK_STOCK_HELP_CONTENTS,
+ ETK_STOCK_MAIL_MESSAGE_NEW,
+ ETK_STOCK_MEDIA_PLAYBACK_PAUSE,
+ ETK_STOCK_MEDIA_PLAYBACK_START,
+ ETK_STOCK_MEDIA_PLAYBACK_STOP,
+ ETK_STOCK_MEDIA_RECORD,
+ ETK_STOCK_MEDIA_SEEK_BACKWARD,
+ ETK_STOCK_MEDIA_SEEK_FORWARD,
+ ETK_STOCK_MEDIA_SKIP_BACKWARD,
+ ETK_STOCK_MEDIA_SKIP_FORWARD,
+ ETK_STOCK_PROCESS_STOP,
+ ETK_STOCK_SYSTEM_LOG_OUT,
+ ETK_STOCK_SYSTEM_SEARCH,
+ ETK_STOCK_SYSTEM_SHUTDOWN,
+ ETK_STOCK_TAB_NEW,
+ ETK_STOCK_VIEW_REFRESH,
+ ETK_STOCK_WINDOW_NEW,
+ ETK_STOCK_ACCESSORIES_CALCULATOR,
+ ETK_STOCK_ACCESSORIES_TEXT_EDITOR,
+ ETK_STOCK_HELP_BROWSER,
+ ETK_STOCK_INTERNET_GROUP_CHAT,
+ ETK_STOCK_INTERNET_MAIL,
+ ETK_STOCK_INTERNET_NEWS_READER,
+ ETK_STOCK_INTERNET_WEB_BROWSER,
+ ETK_STOCK_MULTIMEDIA_VOLUME_CONTROL,
+ ETK_STOCK_OFFICE_CALENDAR,
+ ETK_STOCK_PREFERENCES_DESKTOP_ACCESSIBILITY,
+ ETK_STOCK_PREFERENCES_DESKTOP_FONT,
+ ETK_STOCK_PREFERENCES_DESKTOP_SCREENSAVER,
+ ETK_STOCK_PREFERENCES_DESKTOP_THEME,
+ ETK_STOCK_PREFERENCES_DESKTOP_WALLPAPER,
+ ETK_STOCK_PREFERENCES_SYSTEM_SESSION,
+ ETK_STOCK_PREFERENCES_SYSTEM_WINDOWS,
+ ETK_STOCK_SYSTEM_FILE_MANAGER,
+ ETK_STOCK_SYSTEM_INSTALLER,
+ ETK_STOCK_SYSTEM_LOCK_SCREEN,
+ ETK_STOCK_SYSTEM_SOFTWARE_UPDATE,
+ ETK_STOCK_SYSTEM_USERS,
+ ETK_STOCK_UTILITIES_SYSTEM_MONITOR,
+ ETK_STOCK_UTILITIES_TERMINAL,
+ ETK_STOCK_APPLICATIONS_DEVELOPMENT,
+ ETK_STOCK_APPLICATIONS_GAMES,
+ ETK_STOCK_PREFERENCES_DESKTOP,
+ ETK_STOCK_AUDIO_CARD,
+ ETK_STOCK_AUDIO_INPUT_MICROPHONE,
+ ETK_STOCK_BATTERY,
+ ETK_STOCK_CAMERA_PHOTO,
+ ETK_STOCK_CAMERA_VIDEO,
+ ETK_STOCK_COMPUTER,
+ ETK_STOCK_DRIVE_CDROM,
+ ETK_STOCK_DRIVE_HARDDISK,
+ ETK_STOCK_DRIVE_REMOVABLE_MEDIA,
+ ETK_STOCK_INPUT_GAMING,
+ ETK_STOCK_INPUT_KEYBOARD,
+ ETK_STOCK_INPUT_MOUSE,
+ ETK_STOCK_MEDIA_CDROM,
+ ETK_STOCK_MEDIA_FLOPPY,
+ ETK_STOCK_NETWORK,
+ ETK_STOCK_NETWORK_WIRELESS,
+ ETK_STOCK_PRINTER,
+ ETK_STOCK_PRINTER_REMOTE,
+ ETK_STOCK_VIDEO_DISPLAY,
+ ETK_STOCK_EMBLEM_FAVORITES,
+ ETK_STOCK_EMBLEM_IMPORTANT,
+ ETK_STOCK_EMBLEM_PHOTOS,
+ ETK_STOCK_EMBLEM_SYMBOLIC_LINK,
+ ETK_STOCK_EMBLEM_SYSTEM,
+ ETK_STOCK_FACE_ANGEL,
+ ETK_STOCK_FACE_CRYING,
+ ETK_STOCK_FACE_DEVIL_GRIN,
+ ETK_STOCK_FACE_GLASSES,
+ ETK_STOCK_FACE_GRIN,
+ ETK_STOCK_FACE_SAD,
+ ETK_STOCK_FACE_SMILE_BIG,
+ ETK_STOCK_FACE_SMILE,
+ ETK_STOCK_FACE_SURPRISE,
+ ETK_STOCK_FACE_WINK,
+ ETK_STOCK_APPLICATION_CERTIFICATE,
+ ETK_STOCK_APPLICATION_X_EXECUTABLE,
+ ETK_STOCK_AUDIO_X_GENERIC,
+ ETK_STOCK_IMAGE_X_GENERIC,
+ ETK_STOCK_PACKAGE_X_GENERIC,
+ ETK_STOCK_TEXT_HTML,
+ ETK_STOCK_TEXT_X_GENERIC,
+ ETK_STOCK_TEXT_X_GENERIC_TEMPLATE,
+ ETK_STOCK_TEXT_X_SCRIPT,
+ ETK_STOCK_VIDEO_X_GENERIC,
+ ETK_STOCK_X_DIRECTORY_DESKTOP,
+ ETK_STOCK_X_DIRECTORY_NORMAL_DRAG_ACCEPT,
+ ETK_STOCK_X_DIRECTORY_NORMAL_HOME,
+ ETK_STOCK_X_DIRECTORY_NORMAL_OPEN,
+ ETK_STOCK_X_DIRECTORY_NORMAL,
+ ETK_STOCK_X_DIRECTORY_NORMAL_VISITING,
+ ETK_STOCK_X_DIRECTORY_REMOTE,
+ ETK_STOCK_X_DIRECTORY_REMOTE_SERVER,
+ ETK_STOCK_X_DIRECTORY_REMOTE_WORKGROUP,
+ ETK_STOCK_X_DIRECTORY_TRASH_FULL,
+ ETK_STOCK_X_DIRECTORY_TRASH,
+ ETK_STOCK_X_OFFICE_ADDRESS_BOOK,
+ ETK_STOCK_X_OFFICE_DOCUMENT,
+ ETK_STOCK_X_OFFICE_SPREADSHEET,
+ ETK_STOCK_BATTERY_CAUTION,
+ ETK_STOCK_DIALOG_ERROR,
+ ETK_STOCK_DIALOG_INFORMATION,
+ ETK_STOCK_DIALOG_WARNING,
+ ETK_STOCK_IMAGE_LOADING,
+ ETK_STOCK_IMAGE_MISSING,
+ ETK_STOCK_LOCKED,
+ ETK_STOCK_MAIL_ATTACHMENT,
+ ETK_STOCK_UNLOCKED,
ETK_NUM_STOCK_IDS
};
|
|
From: <enl...@li...> - 2006-01-19 01:57:28
|
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_stock.c
Log Message:
- remove old stuff
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_stock.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- etk_stock.c 19 Jan 2006 01:48:34 -0000 1.6
+++ etk_stock.c 19 Jan 2006 01:57:22 -0000 1.7
@@ -18,18 +18,6 @@
static const Etk_Stock_Item _etk_stock_items[] =
{
-/*
- { "actions/process-stop_16", "actions/process-stop_22", "actions/process-stop_48", "Stop" },
- { "actions/document-open_16", "actions/document-open_22", "actions/document-open_48", "Open" },
- { "actions/document-save_16", "actions/document-save_22", "actions/document-save_48", "Save" },
- { "actions/document-save-as_16", "actions/document-save-as_22", "actions/document-save-as_48", "Save As" },
- { "actions/edit-cut_16", "actions/edit-cut_22", "actions/edit-cut_48", "Cut" },
- { "actions/edit-copy_16", "actions/edit-copy_22", "actions/edit-copy_48", "Copy" },
- { "actions/edit-paste_16", "actions/edit-paste_22", "actions/edit-paste_48", "Paste" },
- { "actions/process-stop_16", "actions/process-stop_22", "actions/process-stop_48", "Cancel" },
- { "actions/go-up_16", "actions/go-up_22", "actions/go-up_48", "Go Up" },
- { "actions/go-down_16", "actions/go-down_22", "actions/go-down_48", "Go Down" },
-*/
{ NULL, NULL },
{ "actions/address-book-new_16", "actions/address-book-new_22", "actions/address-book-new_48", "" },
{ "actions/appointment-new_16", "actions/appointment-new_22", "actions/appointment-new_48", "" },
|
|
From: <enl...@li...> - 2006-01-19 02:17:11
|
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit_main.c
Log Message:
- add some icons to the menus
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- exhibit_main.c 15 Jan 2006 12:31:48 -0000 1.34
+++ exhibit_main.c 19 Jan 2006 02:17:00 -0000 1.35
@@ -736,14 +736,14 @@
menu_item = _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("File"), ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(e->menu_bar), NULL, NULL);
menu = etk_menu_new();
etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(menu));
- _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("New window"), ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_new_window_cb), e);
+ _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("New window"), ETK_STOCK_WINDOW_NEW, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_new_window_cb), e);
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Save image"), ETK_STOCK_DOCUMENT_SAVE, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_save_image_cb), e);
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Save image as"), ETK_STOCK_DOCUMENT_SAVE, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_save_image_as_cb), e);
_ex_menu_item_new(EX_MENU_ITEM_SEPERATOR, NULL, ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), NULL, NULL);
- _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Search"), ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_search_cb), e);
+ _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Search"), ETK_STOCK_SYSTEM_SEARCH, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_search_cb), e);
_ex_menu_item_new(EX_MENU_ITEM_SEPERATOR, NULL, ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), NULL, NULL);
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Rename"), ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_rename_cb), e);
- _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Delete"), ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_delete_cb), e);
+ _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Delete"), ETK_STOCK_X_DIRECTORY_TRASH, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_delete_cb), e);
_ex_menu_item_new(EX_MENU_ITEM_SEPERATOR, NULL, ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), NULL, NULL);
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Close window"), ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_close_window_cb), e);
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Quit"), ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_quit_cb), e);
@@ -773,10 +773,10 @@
menu_item2 = _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Sort"), ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_run_in_cb), e);
submenu = etk_menu_new();
etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item2), ETK_MENU(submenu));
- _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Date"), ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(submenu), ETK_CALLBACK(_ex_sort_date_cb), e);
- _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Size"), ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(submenu), ETK_CALLBACK(_ex_sort_size_cb), e);
- _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Name"), ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(submenu), ETK_CALLBACK(_ex_sort_name_cb), e);
- _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Resolution"), ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(submenu), ETK_CALLBACK(_ex_sort_resol_cb), e);
+ _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Date"), ETK_STOCK_OFFICE_CALENDAR, ETK_MENU_SHELL(submenu), ETK_CALLBACK(_ex_sort_date_cb), e);
+ _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Size"), ETK_STOCK_DRIVE_HARDDISK, ETK_MENU_SHELL(submenu), ETK_CALLBACK(_ex_sort_size_cb), e);
+ _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Name"), ETK_STOCK_TEXT_X_GENERIC, ETK_MENU_SHELL(submenu), ETK_CALLBACK(_ex_sort_name_cb), e);
+ _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Resolution"), ETK_STOCK_UTILITIES_SYSTEM_MONITOR, ETK_MENU_SHELL(submenu), ETK_CALLBACK(_ex_sort_resol_cb), e);
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Zoom in"), EX_IMAGE_ZOOM_IN, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_zoom_in_cb), e);
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Zoom out"), EX_IMAGE_ZOOM_OUT, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_zoom_out_cb), e);
@@ -784,16 +784,16 @@
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Fit to window"), EX_IMAGE_FIT_TO_WINDOW, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_fit_to_window_cb), e);
_ex_menu_item_new(EX_MENU_ITEM_SEPERATOR, NULL, ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), NULL, NULL);
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Toggle slideshow"), ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_toggle_slideshow_cb), e);
- _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Refresh"), ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_refresh_cb), e);
+ _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Refresh"), ETK_STOCK_VIEW_REFRESH, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_refresh_cb), e);
_ex_menu_item_new(EX_MENU_ITEM_SEPERATOR, NULL, ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), NULL, NULL);
- _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Add to favorites"), ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_add_to_fav_cb), e);
- _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("View favorites"), ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_go_to_fav_cb), e);
+ _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Add to favorites"), ETK_STOCK_EMBLEM_PHOTOS, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_add_to_fav_cb), e);
+ _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("View favorites"), ETK_STOCK_EMBLEM_FAVORITES, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_go_to_fav_cb), e);
menu_item = _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Help"), ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(e->menu_bar), NULL, NULL);
menu = etk_menu_new();
etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(menu));
- _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Release notes"), ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_release_notes_cb), e);
- _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("About"), ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_about_cb), e);
+ _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Release notes"), ETK_STOCK_TEXT_X_GENERIC, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_release_notes_cb), e);
+ _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("About"), ETK_STOCK_HELP_CONTENTS, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_about_cb), e);
}
e->zoom_in[0] = etk_button_new();
|
|
From: <enl...@li...> - 2006-01-19 13:56:22
|
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/bin
Modified Files:
Makefile.am etk_test.c etk_test.h
Added Files:
etk_progress_bar_test.c
Log Message:
- implement progress bar widget in both fraction and activity modes. todo: vertical progress bars.
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Makefile.am 23 Dec 2005 14:48:14 -0000 1.7
+++ Makefile.am 19 Jan 2006 13:56:10 -0000 1.8
@@ -32,7 +32,8 @@
etk_scrolled_view_test.c \
etk_menu_test.c \
etk_filechooser_test.c \
-etk_notebook_test.c
+etk_notebook_test.c \
+etk_progress_bar_test.c
etk_test_LDADD = $(top_builddir)/src/lib/libetk.la \
@ecore_libs@ @evas_libs@ @edje_libs@
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_test.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- etk_test.c 15 Jan 2006 11:07:16 -0000 1.11
+++ etk_test.c 19 Jan 2006 13:56:10 -0000 1.12
@@ -56,7 +56,11 @@
{
"Notebook",
etk_test_notebook_window_create
- }
+ },
+ {
+ "Progress Bar",
+ etk_test_progress_bar_window_create
+ }
};
static int num_tests = sizeof(tests) / sizeof (tests[0]);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_test.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- etk_test.h 23 Dec 2005 14:48:14 -0000 1.8
+++ etk_test.h 19 Jan 2006 13:56:10 -0000 1.9
@@ -23,5 +23,6 @@
void etk_test_menu_window_create(void *data);
void etk_test_filechooser_window_create(void *data);
void etk_test_notebook_window_create(void *data);
+void etk_test_progress_bar_window_create(void *data);
#endif
|
|
From: <enl...@li...> - 2006-01-19 13:56:21
|
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/etk/data/themes/default/widgets Added Files: progress_bar.edc Log Message: - implement progress bar widget in both fraction and activity modes. todo: vertical progress bars. |
|
From: <enl...@li...> - 2006-01-19 13:56:22
|
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/data/themes/default
Modified Files:
default.edc
Log Message:
- implement progress bar widget in both fraction and activity modes. todo: vertical progress bars.
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/data/themes/default/default.edc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- default.edc 23 Dec 2005 14:48:13 -0000 1.11
+++ default.edc 19 Jan 2006 13:56:09 -0000 1.12
@@ -22,4 +22,5 @@
#include "widgets/menu.edc"
#include "widgets/statusbar.edc"
#include "widgets/notebook.edc"
+ #include "widgets/progress_bar.edc"
}
|
|
From: <enl...@li...> - 2006-01-19 13:56:22
|
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/etk/src/lib Modified Files: Etk.h Makefile.am etk_types.h Added Files: etk_progress_bar.c etk_progress_bar.h Log Message: - implement progress bar widget in both fraction and activity modes. todo: vertical progress bars. =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/Etk.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- Etk.h 15 Jan 2006 11:07:16 -0000 1.15 +++ Etk.h 19 Jan 2006 13:56:10 -0000 1.16 @@ -56,5 +56,6 @@ #include "etk_statusbar.h" #include "etk_filechooser_widget.h" #include "etk_notebook.h" +#include "etk_progress_bar.h" #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/Makefile.am,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- Makefile.am 15 Jan 2006 11:07:16 -0000 1.18 +++ Makefile.am 19 Jan 2006 13:56:10 -0000 1.19 @@ -39,7 +39,8 @@ etk_menu_shell.h etk_menu.h etk_menu_bar.h etk_menu_item.h \ etk_statusbar.h \ etk_filechooser_widget.h \ -etk_notebook.h +etk_notebook.h \ +etk_progress_bar.h libetk_la_SOURCES = \ etk_main.c etk_utils.c \ @@ -66,6 +67,7 @@ etk_statusbar.c \ etk_filechooser_widget.c \ etk_notebook.c \ +etk_progress_bar.c \ $(ETKHEADERS) installed_headersdir = $(prefix)/include/etk =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_types.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- etk_types.h 15 Jan 2006 11:07:17 -0000 1.20 +++ etk_types.h 19 Jan 2006 13:56:10 -0000 1.21 @@ -103,6 +103,7 @@ typedef struct _Etk_Statusbar Etk_Statusbar; typedef struct _Etk_Filechooser_Widget Etk_Filechooser_Widget; typedef struct _Etk_Notebook Etk_Notebook; +typedef struct _Etk_Progress_Bar Etk_Progress_Bar; /** * @enum Etk_Fill_Policy_Flags |
|
From: <enl...@li...> - 2006-01-19 14:22:47
|
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_progress_bar.c etk_progress_bar.h
Log Message:
- add pulse_step_set/get for changing the pulse step in activity mode.
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_progress_bar.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_progress_bar.c 19 Jan 2006 13:56:10 -0000 1.1
+++ etk_progress_bar.c 19 Jan 2006 14:22:39 -0000 1.2
@@ -142,7 +142,6 @@
/**
* @brief Causes the progress bar to enter pulse mode, subsequent calls simple move the bar around
* @param progress_bar a progess bar
- * @param fraction the fraction (percentage) to set
*/
void etk_progress_bar_pulse(Etk_Progress_Bar *progress_bar)
{
@@ -161,14 +160,14 @@
if(progress_bar->activity_dir == ETK_PROGRESS_BAR_ACTIVITY_DIR_LEFT)
{
- new_drag_value += 0.1; /* TODO: make this changable */
+ new_drag_value += progress_bar->pulse_step;
if(new_drag_value > 1.0)
{
progress_bar->activity_dir = ETK_PROGRESS_BAR_ACTIVITY_DIR_RIGHT;
}
} else {
- new_drag_value -= 0.1; /* TODO: make this changable */
+ new_drag_value -= progress_bar->pulse_step;
if(new_drag_value < 0.0)
{
progress_bar->activity_dir = ETK_PROGRESS_BAR_ACTIVITY_DIR_LEFT;
@@ -178,6 +177,39 @@
edje_object_part_drag_value_set(widget->theme_object, "filler", new_drag_value, 0.0);
}
+/**
+ * @brief Set the step size for the activity mode.
+ * @param progress_bar a progess bar
+ * @param pulse_step the step size
+ */
+void etk_progress_bar_pulse_step_set(Etk_Progress_Bar *progress_bar, double pulse_step)
+{
+ Etk_Widget *widget;
+
+ if (!(widget = ETK_WIDGET(progress_bar)))
+ return;
+
+ if(pulse_step > 0.5 || pulse_step < 0.1)
+ return;
+
+ progress_bar->pulse_step = pulse_step;
+}
+
+/**
+ * @brief Get the step size for the activity mode.
+ * @param progress_bar a progess bar
+ * @return Returns the step size
+ */
+double etk_progress_bar_pulse_step_get(Etk_Progress_Bar *progress_bar)
+{
+ Etk_Widget *widget;
+
+ if (!(widget = ETK_WIDGET(progress_bar)))
+ return;
+
+ return progress_bar->pulse_step;
+}
+
/**************************
*
* Etk specific functions
@@ -191,6 +223,7 @@
return;
progress_bar->activity_dir = ETK_PROGRESS_BAR_ACTIVITY_DIR_LEFT;
+ progress_bar->pulse_step = 0.1;
progress_bar->label = etk_label_new(NULL);
etk_widget_visibility_locked_set(progress_bar->label, ETK_TRUE);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_progress_bar.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_progress_bar.h 19 Jan 2006 13:56:10 -0000 1.1
+++ etk_progress_bar.h 19 Jan 2006 14:22:39 -0000 1.2
@@ -26,7 +26,8 @@
Etk_Widget *label;
- unsigned char activity_dir : 1;
+ unsigned char activity_dir : 1;
+ int pulse_step;
};
Etk_Type *etk_progress_bar_type_get();
@@ -35,10 +36,14 @@
void etk_progress_bar_text_set(Etk_Progress_Bar *progress_bar, const char *label);
const char *etk_progress_bar_text_get(Etk_Progress_Bar *progress_bar);
+
void etk_progress_bar_fraction_set(Etk_Progress_Bar *progress_bar, double fraction);
double etk_progress_bar_fraction_get(Etk_Progress_Bar *progress_bar);
-void etk_progress_bar_pulse(Etk_Progress_Bar *progress_bar);
+void etk_progress_bar_pulse(Etk_Progress_Bar *progress_bar);
+void etk_progress_bar_pulse_step_set(Etk_Progress_Bar *progress_bar, double pulse_step);
+double etk_progress_bar_pulse_step_get(Etk_Progress_Bar *progress_bar);
+
/** @} */
#endif
|
|
From: <enl...@li...> - 2006-01-19 14:27:29
|
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_progress_bar.h
Log Message:
oops
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_progress_bar.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_progress_bar.h 19 Jan 2006 14:22:39 -0000 1.2
+++ etk_progress_bar.h 19 Jan 2006 14:26:59 -0000 1.3
@@ -27,7 +27,7 @@
Etk_Widget *label;
unsigned char activity_dir : 1;
- int pulse_step;
+ double pulse_step;
};
Etk_Type *etk_progress_bar_type_get();
|
|
From: <enl...@li...> - 2006-01-19 23:09:31
|
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_progress_bar.c etk_progress_bar.h etk_types.h
Log Message:
- some stubs for vertical progress bars.
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_progress_bar.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_progress_bar.c 19 Jan 2006 14:22:39 -0000 1.2
+++ etk_progress_bar.c 19 Jan 2006 23:09:24 -0000 1.3
@@ -210,6 +210,27 @@
return progress_bar->pulse_step;
}
+#if 0
+/* TODO: we cant allow this until we have vertical labels */
+/**
+ * @brief Set the orientation of the progress bar.
+ * @param progress_bar a progess bar
+ * @param orientation the new orientation
+ */
+void etk_progress_bar_pulse_step_set(Etk_Progress_Bar *progress_bar, Etk_Progress_Bar_Orientation orientation)
+{
+ Etk_Widget *widget;
+
+ if (!(widget = ETK_WIDGET(progress_bar)))
+ return;
+
+ if(progress_bar->orientation == orientation)
+ return;
+
+ progress_bar->orientation = orientation;
+}
+#endif
+
/**************************
*
* Etk specific functions
@@ -224,6 +245,7 @@
progress_bar->activity_dir = ETK_PROGRESS_BAR_ACTIVITY_DIR_LEFT;
progress_bar->pulse_step = 0.1;
+ progress_bar->orientation = ETK_PROGRESS_BAR_LEFT_TO_RIGHT;
progress_bar->label = etk_label_new(NULL);
etk_widget_visibility_locked_set(progress_bar->label, ETK_TRUE);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_progress_bar.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- etk_progress_bar.h 19 Jan 2006 14:26:59 -0000 1.3
+++ etk_progress_bar.h 19 Jan 2006 23:09:24 -0000 1.4
@@ -18,6 +18,12 @@
/** @brief Checks if the object is an Etk_Progress_Bar */
#define ETK_IS_PROGRESS_BAR(obj) (ETK_OBJECT_CHECK_TYPE((obj), ETK_PROGRESS_BAR_TYPE))
+enum _Etk_Progress_Bar_Orientation
+{
+ ETK_PROGRESS_BAR_LEFT_TO_RIGHT,
+ ETK_PROGRESS_BAR_BOTTOM_TO_TOP
+};
+
struct _Etk_Progress_Bar
{
/* private: */
@@ -28,6 +34,7 @@
unsigned char activity_dir : 1;
double pulse_step;
+ Etk_Progress_Bar_Orientation orientation;
};
Etk_Type *etk_progress_bar_type_get();
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_types.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- etk_types.h 19 Jan 2006 13:56:10 -0000 1.21
+++ etk_types.h 19 Jan 2006 23:09:24 -0000 1.22
@@ -104,6 +104,7 @@
typedef struct _Etk_Filechooser_Widget Etk_Filechooser_Widget;
typedef struct _Etk_Notebook Etk_Notebook;
typedef struct _Etk_Progress_Bar Etk_Progress_Bar;
+typedef enum _Etk_Progress_Bar_Orientation Etk_Progress_Bar_Orientation;
/**
* @enum Etk_Fill_Policy_Flags
|
|
From: <enl...@li...> - 2006-01-20 00:21:10
|
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit_main.c
Log Message:
fix some icons
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- exhibit_main.c 19 Jan 2006 02:17:00 -0000 1.35
+++ exhibit_main.c 20 Jan 2006 00:21:00 -0000 1.36
@@ -787,7 +787,7 @@
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Refresh"), ETK_STOCK_VIEW_REFRESH, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_refresh_cb), e);
_ex_menu_item_new(EX_MENU_ITEM_SEPERATOR, NULL, ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), NULL, NULL);
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Add to favorites"), ETK_STOCK_EMBLEM_PHOTOS, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_add_to_fav_cb), e);
- _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("View favorites"), ETK_STOCK_EMBLEM_FAVORITES, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_go_to_fav_cb), e);
+ _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("View favorites"), ETK_STOCK_EMBLEM_FAVORITE, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_go_to_fav_cb), e);
menu_item = _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("Help"), ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(e->menu_bar), NULL, NULL);
menu = etk_menu_new();
|
|
From: <enl...@li...> - 2006-01-20 00:22:53
|
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/etk/data/icons/default/icons/16x16/mimetypes Added Files: x-directory-trash.png Log Message: fix some icons |
|
From: <enl...@li...> - 2006-01-20 00:22:53
|
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/etk/data/icons/default/icons/16x16/actions Added Files: dialog-cancel.png Log Message: fix some icons |
|
From: <enl...@li...> - 2006-01-20 00:22:54
|
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/etk/data/icons/default/icons/22x22/actions Added Files: dialog-cancel.png Log Message: fix some icons |
|
From: <enl...@li...> - 2006-01-20 00:22:54
|
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/etk/data/icons/default/icons/48x48/mimetypes Added Files: x-directory-trash.png Log Message: fix some icons |
|
From: <enl...@li...> - 2006-01-20 00:22:55
|
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/etk/data/icons/default/icons/48x48/actions Added Files: dialog-cancel.png Log Message: fix some icons |
|
From: <enl...@li...> - 2006-01-20 00:22:55
|
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/etk/data/icons/default/icons/22x22/mimetypes Added Files: x-directory-trash.png Log Message: fix some icons |
|
From: <enl...@li...> - 2006-01-20 00:22:57
|
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_stock.c etk_stock.h
Log Message:
fix some icons
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_stock.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- etk_stock.c 19 Jan 2006 01:57:22 -0000 1.7
+++ etk_stock.c 20 Jan 2006 00:22:47 -0000 1.8
@@ -121,7 +121,7 @@
{ "devices/printer_16", "devices/printer_22", "devices/printer_48", "" },
{ "devices/printer-remote_16", "devices/printer-remote_22", "devices/printer-remote_48", "" },
{ "devices/video-display_16", "devices/video-display_22", "devices/video-display_48", "" },
- { "emblems/emblem-favorites_16", "emblems/emblem-favorites_22", "emblems/emblem-favorites_48", "" },
+ { "emblems/emblem-favorite_16", "emblems/emblem-favorite_22", "emblems/emblem-favorite_48", "" },
{ "emblems/emblem-important_16", "emblems/emblem-important_22", "emblems/emblem-important_48", "" },
{ "emblems/emblem-photos_16", "emblems/emblem-photos_22", "emblems/emblem-photos_48", "" },
{ "emblems/emblem-symbolic-link_16", "emblems/emblem-symbolic-link_22", "emblems/emblem-symbolic-link_48", "" },
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_stock.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- etk_stock.h 19 Jan 2006 01:48:34 -0000 1.6
+++ etk_stock.h 20 Jan 2006 00:22:47 -0000 1.7
@@ -122,7 +122,7 @@
ETK_STOCK_PRINTER,
ETK_STOCK_PRINTER_REMOTE,
ETK_STOCK_VIDEO_DISPLAY,
- ETK_STOCK_EMBLEM_FAVORITES,
+ ETK_STOCK_EMBLEM_FAVORITE,
ETK_STOCK_EMBLEM_IMPORTANT,
ETK_STOCK_EMBLEM_PHOTOS,
ETK_STOCK_EMBLEM_SYMBOLIC_LINK,
|
|
From: <enl...@li...> - 2006-01-20 00:23:22
|
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/data/icons/default
Modified Files:
default.edc
Log Message:
fix some icons
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/data/icons/default/default.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- default.edc 15 Jan 2006 11:20:45 -0000 1.1
+++ default.edc 20 Jan 2006 00:22:46 -0000 1.2
@@ -56,6 +56,7 @@
STOCK_ICON("16x16/mimetypes/x-office-spreadsheet.png", "mimetypes/x-office-spreadsheet_16", 16)
STOCK_ICON("16x16/mimetypes/x-office-document.png", "mimetypes/x-office-document_16", 16)
STOCK_ICON("16x16/mimetypes/x-office-address-book.png", "mimetypes/x-office-address-book_16", 16)
+STOCK_ICON("16x16/mimetypes/x-directory-trash.png", "mimetypes/x-directory-trash_16", 16)
STOCK_ICON("16x16/mimetypes/video-x-generic.png", "mimetypes/video-x-generic_16", 16)
STOCK_ICON("16x16/mimetypes/text-x-script.png", "mimetypes/text-x-script_16", 16)
STOCK_ICON("16x16/mimetypes/text-x-generic.png", "mimetypes/text-x-generic_16", 16)
@@ -207,6 +208,7 @@
STOCK_ICON("16x16/actions/document-print-preview.png", "actions/document-print-preview_16", 16)
STOCK_ICON("16x16/actions/document-open.png", "actions/document-open_16", 16)
STOCK_ICON("16x16/actions/document-new.png", "actions/document-new_16", 16)
+STOCK_ICON("16x16/actions/dialog-cancel.png", "actions/dialog-cancel_16", 16)
STOCK_ICON("16x16/actions/contact-new.png", "actions/contact-new_16", 16)
STOCK_ICON("16x16/actions/bookmark-new.png", "actions/bookmark-new_16", 16)
STOCK_ICON("16x16/actions/appointment-new.png", "actions/appointment-new_16", 16)
@@ -239,6 +241,7 @@
STOCK_ICON("22x22/mimetypes/x-office-spreadsheet.png", "mimetypes/x-office-spreadsheet_22", 22)
STOCK_ICON("22x22/mimetypes/x-office-document.png", "mimetypes/x-office-document_22", 22)
STOCK_ICON("22x22/mimetypes/x-office-address-book.png", "mimetypes/x-office-address-book_22", 22)
+STOCK_ICON("22x22/mimetypes/x-directory-trash.png", "mimetypes/x-directory-trash_22", 22)
STOCK_ICON("22x22/mimetypes/video-x-generic.png", "mimetypes/video-x-generic_22", 22)
STOCK_ICON("22x22/mimetypes/text-x-script.png", "mimetypes/text-x-script_22", 22)
STOCK_ICON("22x22/mimetypes/text-x-generic.png", "mimetypes/text-x-generic_22", 22)
@@ -390,6 +393,7 @@
STOCK_ICON("22x22/actions/document-print-preview.png", "actions/document-print-preview_22", 22)
STOCK_ICON("22x22/actions/document-open.png", "actions/document-open_22", 22)
STOCK_ICON("22x22/actions/document-new.png", "actions/document-new_22", 22)
+STOCK_ICON("22x22/actions/dialog-cancel.png", "actions/dialog-cancel_22", 22)
STOCK_ICON("22x22/actions/contact-new.png", "actions/contact-new_22", 22)
STOCK_ICON("22x22/actions/bookmark-new.png", "actions/bookmark-new_22", 22)
STOCK_ICON("22x22/actions/appointment-new.png", "actions/appointment-new_22", 22)
@@ -422,6 +426,7 @@
STOCK_ICON("48x48/mimetypes/x-office-spreadsheet.png", "mimetypes/x-office-spreadsheet_48", 48)
STOCK_ICON("48x48/mimetypes/x-office-document.png", "mimetypes/x-office-document_48", 48)
STOCK_ICON("48x48/mimetypes/x-office-address-book.png", "mimetypes/x-office-address-book_48", 48)
+STOCK_ICON("48x48/mimetypes/x-directory-trash.png", "mimetypes/x-directory-trash_48", 48)
STOCK_ICON("48x48/mimetypes/video-x-generic.png", "mimetypes/video-x-generic_48", 48)
STOCK_ICON("48x48/mimetypes/text-x-script.png", "mimetypes/text-x-script_48", 48)
STOCK_ICON("48x48/mimetypes/text-x-generic.png", "mimetypes/text-x-generic_48", 48)
@@ -572,6 +577,7 @@
STOCK_ICON("48x48/actions/document-print-preview.png", "actions/document-print-preview_48", 48)
STOCK_ICON("48x48/actions/document-open.png", "actions/document-open_48", 48)
STOCK_ICON("48x48/actions/document-new.png", "actions/document-new_48", 48)
+STOCK_ICON("48x48/actions/dialog-cancel.png", "actions/dialog-cancel_48", 48)
STOCK_ICON("48x48/actions/contact-new.png", "actions/contact-new_48", 48)
STOCK_ICON("48x48/actions/bookmark-new.png", "actions/bookmark-new_48", 48)
STOCK_ICON("48x48/actions/appointment-new.png", "actions/appointment-new_48", 48)
|
|
From: <enl...@li...> - 2006-01-21 10:54:33
|
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/bin
Modified Files:
etk_progress_bar_test.c
Log Message:
- better values for progress bar test, small fix
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_progress_bar_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_progress_bar_test.c 19 Jan 2006 13:56:10 -0000 1.1
+++ etk_progress_bar_test.c 21 Jan 2006 10:53:47 -0000 1.2
@@ -50,11 +50,12 @@
etk_box_pack_start(ETK_BOX(vbox), pbar, ETK_TRUE, ETK_TRUE, 0);
pbar2 = etk_progress_bar_new_with_text(_("Loading..."));
+ etk_progress_bar_pulse_step_set(ETK_PROGRESS_BAR(pbar2), 0.05);
etk_box_pack_start(ETK_BOX(vbox), pbar2, ETK_TRUE, ETK_TRUE, 0);
etk_window_title_set(ETK_WINDOW(win), _("Etk Progress Bar Test"));
etk_widget_show_all(win);
ecore_timer_add(0.05, _etk_test_progress_bar_update, pbar);
- ecore_timer_add(0.1, _etk_test_progress_bar_update2, pbar2);
+ ecore_timer_add(0.05, _etk_test_progress_bar_update2, pbar2);
}
|
|
From: <enl...@li...> - 2006-01-21 10:54:33
|
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_progress_bar.c
Log Message:
- better values for progress bar test, small fix
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_progress_bar.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- etk_progress_bar.c 19 Jan 2006 23:09:24 -0000 1.3
+++ etk_progress_bar.c 21 Jan 2006 10:53:48 -0000 1.4
@@ -189,7 +189,7 @@
if (!(widget = ETK_WIDGET(progress_bar)))
return;
- if(pulse_step > 0.5 || pulse_step < 0.1)
+ if(pulse_step > 1.0 || pulse_step < 0.0)
return;
progress_bar->pulse_step = pulse_step;
|
|
From: <enl...@li...> - 2006-01-24 22:09:36
|
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit_main.c
Log Message:
return 0 on exit
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- exhibit_main.c 20 Jan 2006 00:21:00 -0000 1.36
+++ exhibit_main.c 24 Jan 2006 22:09:30 -0000 1.37
@@ -940,5 +940,5 @@
etk_main();
etk_shutdown();
- return 1;
+ return 0;
}
|
|
From: <enl...@li...> - 2006-01-28 10:12:15
|
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/exhibit Modified Files: exhibit.spec Log Message: - new spec file, thanks Didier. =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/exhibit/exhibit.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- exhibit.spec 14 Dec 2005 11:33:28 -0000 1.1 +++ exhibit.spec 28 Jan 2006 10:12:03 -0000 1.2 @@ -1,79 +1,56 @@ -# Note that this is NOT a relocatable package -%define ver 0.0.1 -%define rel 1 -%define prefix /usr - -Summary: exhibit -Name: exhibit -Version: %ver -Release: %rel -Copyright: BSD -Group: System Environment/Libraries -Source: ftp://ftp.enlightenment.org/pub/exhibit/exhibit-%{ver}.tar.gz -BuildRoot: /var/tmp/exhibit-root -Packager: The Rasterman <ra...@ra...> -URL: http://www.enlightenment.org/ -BuildRequires: libjpeg-devel -BuildRequires: zlib-devel -Requires: libjpeg -Requires: zlib - -Docdir: %{prefix}/doc - -%description - -exhibit is a Canvas Server - -%package devel -Summary: exhibit headers, static libraries, documentation and test programs -Group: System Environment/Libraries -Requires: %{name} = %{version} - -%description devel -Headers, static libraries, test programs and documentation for Eet - -%prep -rm -rf $RPM_BUILD_ROOT - -%setup -q - -%build -./configure --prefix=%prefix - -if [ "$SMP" != "" ]; then - (make "MAKE=make -k -j $SMP"; exit 0) - make -else - make -fi -########################################################################### - -%install -make DESTDIR=$RPM_BUILD_ROOT install - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -/sbin/ldconfig - -%postun -/sbin/ldconfig - -%files -%defattr(-,root,root) -%attr(755,root,root) %{prefix}/lib/libexhibit.so* -%attr(755,root,root) %{prefix}/lib/libexhibit.la - -%files devel -%attr(755,root,root) %{prefix}/lib/libexhibit.a -%attr(755,root,root) %{prefix}/bin/exhibit* -%{prefix}/include/exhibit* -%doc AUTHORS -%doc COPYING -%doc README -%doc exhibit_docs.tar.gz - -%changelog -* Sat Jun 23 2001 The Rasterman <ra...@ra...> -- Created spec file +Name: exhibit +Summary: Yet another image viewer that uses Etk as its toolkit +Version: 0.0.1 +Release: 0.%(date '+%Y%m%d')cvs%{?dist} +License: BSD +Group: Applications/Multimedia +URL: http://www.enlightenment.org +Source0: %{name}-%{version}-%(date '+%Y%m%d').tar.gz +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: ecore-devel, evas-devel, edje-devel, etk-devel, epsilon-devel +BuildRequires: enlightenment-devel, engrave-devel + +%description +Exhibit is an image viewer that uses Etk as its toolkit. Exhibit supports +image previews for image types supported by Evas and allows for +directory changing using a point and click interface or a text input box with +tab autocompletion support. Exhibit also has image effect, tabs, and favorites +support. + +%prep +%setup -q + +%build +rm -rf missing +touch README +aclocal -I m4 +autoheader +autoconf +libtoolize --copy --automake +automake --add-missing --copy --gnu + +%configure +%{__make} %{?_smp_mflags} + +%install +rm -fr %{buildroot} +%{__make} %{?mflags_install} DESTDIR=%{buildroot} install + +%clean +rm -fr %{buildroot} + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root) +%{_bindir}/exhibit* +%{_datadir}/exhibit* +%doc AUTHORS ChangeLog COPYING* INSTALL NEWS README TODO + +%changelog +* Fri Jan 27 2006 Didier F. B. Casse <didier[AT]microtronyx.com> - 0.0.1-20060127 +- Initial RPM release + + |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X