--- a/src/gui/Makefile Tue Nov 10 14:05:43 2009 +0000
+++ b/src/gui/Makefile Tue Nov 10 14:37:37 2009 +0000
@@ -34,14 +34,16 @@
ROOTUSRLIB = $(ROOT)/lib
ROOTAPPICONSHARE = $(ROOT)/share/icons/hicolor/48x48/apps
+ROOTAPPHIGHICONSHARE = $(ROOT)/share/icons/HighContrast/48x48/apps
ROOTDATASHARE = $(ROOTSHARE)/data
ROOTDESKTOPSHARE = $(ROOT)/share/applications
ROOTGCONFSHARE = $(ROOTETC)/gconf/schemas
ROOTHELPSHARE = $(ROOT)/share/gnome/help/package-manager
+ROOTHIGHICON16SHARE = $(ROOTSHARE)/icons/HighContrast/16x16/actions
+ROOTHIGHICON24SHARE = $(ROOTSHARE)/icons/HighContrast/24x24/actions
+ROOTHIGHICON48SHARE = $(ROOTSHARE)/icons/HighContrast/48x48/actions
ROOTICON16SHARE = $(ROOTSHARE)/icons/hicolor/16x16/actions
-ROOTICON22SHARE = $(ROOTSHARE)/icons/hicolor/22x22/actions
ROOTICON24SHARE = $(ROOTSHARE)/icons/hicolor/24x24/actions
-ROOTICON36SHARE = $(ROOTSHARE)/icons/hicolor/36x36/actions
ROOTICON48SHARE = $(ROOTSHARE)/icons/hicolor/48x48/actions
ROOTMIMEICONSHARE = $(ROOT)/share/icons/hicolor/48x48/mimetypes
ROOTMIMETYPESHARE = $(ROOT)/share/mime/packages
@@ -52,12 +54,16 @@
ROOTDIRS = \
$(ROOTAPPICONSHARE) \
+ $(ROOTAPPHIGHICONSHARE) \
$(ROOTDATASHARE) \
$(ROOTDESKTOPSHARE) \
$(ROOTGCONFSHARE) \
$(ROOTHELPSHARE) \
+ $(ROOTHIGHICON16SHARE) \
+ $(ROOTHIGHICON24SHARE) \
+ $(ROOTHIGHICON36SHARE) \
+ $(ROOTHIGHICON48SHARE) \
$(ROOTICON16SHARE) \
- $(ROOTICON22SHARE) \
$(ROOTICON24SHARE) \
$(ROOTICON36SHARE) \
$(ROOTICON48SHARE) \
@@ -68,7 +74,10 @@
$(ROOTSPSHARE)
APPICONS = \
- data/packagemanager.png
+ data/icons/48x48/packagemanager.png
+
+APPHIGHICONS = \
+ data/icons/HighContrast/48x48/packagemanager.png
CATALOG = \
data/opensolaris.org \
@@ -106,6 +115,29 @@
BUILDHELPFILES = \
$(HELP_LOCALES:%=help/%/package-manager.xml) \
+HIGHICONS16 = \
+ data/icons/HighContrast/16x16/filter_all.png \
+ data/icons/HighContrast/16x16/filter_selected.png \
+ data/icons/HighContrast/16x16/progress_checkmark.png \
+ data/icons/HighContrast/16x16/selection.png \
+ data/icons/HighContrast/16x16/status_checkmark.png \
+ data/icons/HighContrast/16x16/status_installed.png \
+ data/icons/HighContrast/16x16/status_newupdate.png \
+ data/icons/HighContrast/16x16/status_notinstalled.png
+
+HIGHICONS24 = \
+ data/icons/HighContrast/24x24/pm-install_update.png \
+ data/icons/HighContrast/24x24/pm-refresh.png \
+ data/icons/HighContrast/24x24/pm-remove.png \
+ data/icons/HighContrast/24x24/pm-update_all.png
+
+HIGHICONS48 = \
+ data/icons/HighContrast/48x48/packagemanager.png \
+ data/icons/HighContrast/48x48/pm-install_update.png \
+ data/icons/HighContrast/48x48/pm-refresh.png \
+ data/icons/HighContrast/48x48/pm-remove.png \
+ data/icons/HighContrast/48x48/pm-update_all.png
+
ICONS16 = \
data/icons/16x16/filter_all.png \
data/icons/16x16/filter_selected.png \
@@ -117,18 +149,12 @@
data/icons/16x16/status_newupdate.png \
data/icons/16x16/status_notinstalled.png
-ICONS22 = \
- data/icons/22x22/search.png
-
ICONS24 = \
data/icons/24x24/pm-install_update.png \
data/icons/24x24/pm-refresh.png \
data/icons/24x24/pm-remove.png \
data/icons/24x24/pm-update_all.png
-ICONS36 = \
- data/icons/36x36/PM_package.png
-
ICONS48 = \
data/icons/48x48/packagemanager.png \
data/icons/48x48/pm-install_update.png \
@@ -173,6 +199,7 @@
# Define the paths to all of the stuff we'll install.
#
ROOTAPPICONS = $(APPICONS:data/%=$(ROOTAPPICONSHARE)/%)
+ROOTAPPHIGHICONS = $(APPHIGHICONS:data/%=$(ROOTAPPHIGHICONSHARE)/%)
ROOTCATALOG = $(CATALOG:data/%=$(ROOTDATASHARE)/%)
@@ -198,10 +225,12 @@
ROOTSPFILES = \
$(STATICSPFILES:data/startpagebase/%=$(ROOTSPSHARE)/%)
+ROOTHIGHICONS16 = $(HIGHICONS16:data/icons/HighContrast/16x16/%=$(ROOTHIGHICON16SHARE)/%)
+ROOTHIGHICONS24 = $(HIGHICONS24:data/icons/HighContrast/24x24/%=$(ROOTHIGHICON24SHARE)/%)
+ROOTHIGHICONS48 = $(HIGHICONS48:data/icons/HighContrast/48x48/%=$(ROOTHIGHICON48SHARE)/%)
+
ROOTICONS16 = $(ICONS16:data/icons/16x16/%=$(ROOTICON16SHARE)/%)
-ROOTICONS22 = $(ICONS22:data/icons/22x22/%=$(ROOTICON22SHARE)/%)
ROOTICONS24 = $(ICONS24:data/icons/24x24/%=$(ROOTICON24SHARE)/%)
-ROOTICONS36 = $(ICONS36:data/icons/36x36/%=$(ROOTICON36SHARE)/%)
ROOTICONS48 = $(ICONS48:data/icons/48x48/%=$(ROOTICON48SHARE)/%)
ROOTPYGLADE = $(ROOTSHARE)/packagemanager.glade
@@ -214,12 +243,16 @@
ROOTCOMPONENTS = \
$(ROOTAPPICONS) \
+ $(ROOTAPPHIGHICONS) \
$(ROOTCATALOG) \
$(ROOTDESKTOP) \
$(ROOTGCONF) \
$(ROOTHELPFILES) \
+ $(ROOTHIGHICONS16) \
+ $(ROOTHIGHICONS24) \
+ $(ROOTHIGHICONS36) \
+ $(ROOTHIGHICONS48) \
$(ROOTICONS16) \
- $(ROOTICONS22) \
$(ROOTICONS24) \
$(ROOTICONS36) \
$(ROOTICONS48) \
@@ -279,7 +312,8 @@
ln -sf $(PWD)/data/addmoresoftware.desktop /usr/share/applications/addmoresoftware.desktop
ln -sf $(PWD)/data/packagemanager.schemas /etc/gconf/schemas/packagemanager-preferences.schemas
ln -sf $(PWD)/data/icons /usr/share/package-manager/icons/hicolor
- ln -sf $(PWD)/data/icons/packagemanager.png /usr/share/icons/hicolor/48x48/apps/packagemanager.png
+ ln -sf $(PWD)/data/icons/48x48/packagemanager.png /usr/share/icons/hicolor/48x48/apps/packagemanager.png
+ ln -sf $(PWD)/data/icons/HighContrast/48x48/packagemanager.png /usr/share/icons/HighContrast/48x48/apps/packagemanager.png
ln -sf $(PWD)/modules /usr/lib/python2.4/vendor-packages/pkg/gui
link-clean:
@@ -289,10 +323,14 @@
rm -f /usr/share/applications/addmoresoftware.desktop
rm -f /usr/bin/packagemanager
rm -f /usr/share/icons/hicolor/48x48/apps/packagemanager.png
+ rm -f /usr/share/icons/HighContrast/48x48/apps/packagemanager.png
$(ROOTDIRS):
$(INSTALL) -d -m 0755 $@
+$(ROOTAPPHIGHICONSHARE)/%: $(ROOTDIRS) data/%
+ $(INSTALL) -f $(ROOTAPPHIGHICONSHARE) -m 0644 $<
+
$(ROOTAPPICONSHARE)/%: $(ROOTDIRS) data/%
$(INSTALL) -f $(ROOTAPPICONSHARE) -m 0644 $<
@@ -331,18 +369,21 @@
$(ROOTHELPSHARE)/%: $(ROOTHELPDIRS) help/%
$(INSTALL) -f $(@D) -m 0644 $<
+$(ROOTHIGHICON16SHARE)/%: $(ROOTDIRS) data/icons/HighContrast/16x16/%
+ $(INSTALL) -f $(ROOTHIGHICON16SHARE) -m 0644 $<
+
+$(ROOTHIGHICON24SHARE)/%: $(ROOTDIRS) data/icons/HighContrast/24x24/%
+ $(INSTALL) -f $(ROOTHIGHICON24SHARE) -m 0644 $<
+
+$(ROOTHIGHICON48SHARE)/%: $(ROOTDIRS) data/icons/HighContrast/48x48/%
+ $(INSTALL) -f $(ROOTHIGHICON48SHARE) -m 0644 $<
+
$(ROOTICON16SHARE)/%: $(ROOTDIRS) data/icons/16x16/%
$(INSTALL) -f $(ROOTICON16SHARE) -m 0644 $<
-$(ROOTICON22SHARE)/%: $(ROOTDIRS) data/icons/22x22/%
- $(INSTALL) -f $(ROOTICON22SHARE) -m 0644 $<
-
$(ROOTICON24SHARE)/%: $(ROOTDIRS) data/icons/24x24/%
$(INSTALL) -f $(ROOTICON24SHARE) -m 0644 $<
-$(ROOTICON36SHARE)/%: $(ROOTDIRS) data/icons/36x36/%
- $(INSTALL) -f $(ROOTICON36SHARE) -m 0644 $<
-
$(ROOTICON48SHARE)/%: $(ROOTDIRS) data/icons/48x48/%
$(INSTALL) -f $(ROOTICON48SHARE) -m 0644 $<
Binary file src/gui/data/icons/22x22/search.png has changed
Binary file src/gui/data/icons/36x36/PM_package.png has changed
Binary file src/gui/data/icons/HighContrast/16x16/filter_all.png has changed
Binary file src/gui/data/icons/HighContrast/16x16/filter_selected.png has changed
Binary file src/gui/data/icons/HighContrast/16x16/progress_checkmark.png has changed
Binary file src/gui/data/icons/HighContrast/16x16/selection.png has changed
Binary file src/gui/data/icons/HighContrast/16x16/status_checkmark.png has changed
Binary file src/gui/data/icons/HighContrast/16x16/status_installed.png has changed
Binary file src/gui/data/icons/HighContrast/16x16/status_newupdate.png has changed
Binary file src/gui/data/icons/HighContrast/16x16/status_notinstalled.png has changed
Binary file src/gui/data/icons/HighContrast/24x24/pm-install_update.png has changed
Binary file src/gui/data/icons/HighContrast/24x24/pm-refresh.png has changed
Binary file src/gui/data/icons/HighContrast/24x24/pm-remove.png has changed
Binary file src/gui/data/icons/HighContrast/24x24/pm-update_all.png has changed
Binary file src/gui/data/icons/HighContrast/48x48/packagemanager.png has changed
Binary file src/gui/data/icons/HighContrast/48x48/pm-install_update.png has changed
Binary file src/gui/data/icons/HighContrast/48x48/pm-refresh.png has changed
Binary file src/gui/data/icons/HighContrast/48x48/pm-remove.png has changed
Binary file src/gui/data/icons/HighContrast/48x48/pm-update_all.png has changed
--- a/src/gui/data/packagemanager.glade Tue Nov 10 14:05:43 2009 +0000
+++ b/src/gui/data/packagemanager.glade Tue Nov 10 14:37:37 2009 +0000
@@ -11,6 +11,7 @@
<property name="default_width">800</property>
<property name="default_height">615</property>
<signal name="key_press_event" handler="on_mainwindow_key_press_event"/>
+ <signal name="style_set" handler="on_mainwindow_style_set"/>
<signal name="check_resize" handler="on_mainwindow_check_resize"/>
<signal name="delete_event" handler="on_mainwindow_delete_event"/>
<child>
Binary file src/gui/data/packagemanager.png has changed
--- a/src/gui/modules/installupdate.py Tue Nov 10 14:05:43 2009 +0000
+++ b/src/gui/modules/installupdate.py Tue Nov 10 14:37:37 2009 +0000
@@ -196,7 +196,7 @@
self.w_ua_dialog.set_icon(self.icon_confirm_dialog)
else:
self.w_ua_dialog.set_icon(
- self.parent.w_main_window.get_icon())
+ self.w_main_window.get_icon())
if self.action == enumerations.REMOVE:
#We are not showing the download stage in the main stage list
--- a/src/gui/modules/webinstall.py Tue Nov 10 14:05:43 2009 +0000
+++ b/src/gui/modules/webinstall.py Tue Nov 10 14:37:37 2009 +0000
@@ -420,8 +420,6 @@
action = enumerations.INSTALL_UPDATE,
parent_name = _("Package Manager"),
main_window = self.w_webinstall_dialog,
- icon_confirm_dialog = gui_misc.get_icon(
- self.icon_theme,'PM_package', 36),
web_install = True)
def process_pkg_stems(self, pub_info, packages):
--- a/src/packagemanager.py Tue Nov 10 14:05:43 2009 +0000
+++ b/src/packagemanager.py Tue Nov 10 14:37:37 2009 +0000
@@ -532,6 +532,8 @@
self.__on_mainwindow_check_resize,
"on_mainwindow_key_press_event": \
self.__on_mainwindow_key_press_event,
+ "on_mainwindow_style_set": \
+ self.__on_mainwindow_style_set,
"on_searchentry_changed":self.__on_searchentry_changed,
"on_searchentry_focus_in_event": \
self.__on_searchentry_focus_in,
@@ -797,6 +799,13 @@
return filename
+ @staticmethod
+ def __on_mainwindow_style_set(widget, previous_style):
+ ''' This is called when theme is changed.
+ We need to change the status icons in the Package List,
+ the search icon and the icons in the filter list'''
+ return
+
def __set_search_text_mode(self, style):
if style == enumerations.SEARCH_STYLE_NORMAL:
self.w_searchentry.modify_text(gtk.STATE_NORMAL,
--- a/src/pkgdefs/SUNWipkg-gui/prototype Tue Nov 10 14:05:43 2009 +0000
+++ b/src/pkgdefs/SUNWipkg-gui/prototype Tue Nov 10 14:37:37 2009 +0000
@@ -53,8 +53,13 @@
f none usr/share/gnome/help/package-manager/C/figures/update_all.png 444 root bin
f none usr/share/gnome/help/package-manager/C/figures/wi_start.png 444 root bin
d none usr/share/icons 755 root other
+d none usr/share/icons/HighContrast 755 root other
+d none usr/share/icons/HighContrast/48x48 755 root other
+d none usr/share/icons/HighContrast/48x48/apps 755 root other
+f none usr/share/icons/HighContrast/48x48/apps/packagemanager.png 444 root other
d none usr/share/icons/hicolor 755 root other
d none usr/share/icons/hicolor/48x48 755 root other
+d none usr/share/icons/hicolor/48x48/apps 755 root other
f none usr/share/icons/hicolor/48x48/apps/packagemanager.png 444 root other
d none usr/share/icons/hicolor/48x48/mimetypes 755 root other
f none usr/share/icons/hicolor/48x48/mimetypes/gnome-mime-application-vnd.pkg5.info.png 644 root other
@@ -66,6 +71,30 @@
f none usr/share/mime/packages/packagemanager-info.xml 644 root bin
d none usr/share/package-manager 755 root bin
d none usr/share/package-manager/icons 755 root bin
+d none usr/share/package-manager/icons/HighContrast 755 root bin
+d none usr/share/package-manager/icons/HighContrast/16x16 755 root bin
+d none usr/share/package-manager/icons/HighContrast/16x16/actions 755 root bin
+f none usr/share/package-manager/icons/HighContrast/16x16/actions/filter_all.png 444 root other
+f none usr/share/package-manager/icons/HighContrast/16x16/actions/filter_selected.png 444 root other
+f none usr/share/package-manager/icons/HighContrast/16x16/actions/progress_checkmark.png 444 root other
+f none usr/share/package-manager/icons/HighContrast/16x16/actions/selection.png 444 root other
+f none usr/share/package-manager/icons/HighContrast/16x16/actions/status_checkmark.png 444 root other
+f none usr/share/package-manager/icons/HighContrast/16x16/actions/status_installed.png 444 root other
+f none usr/share/package-manager/icons/HighContrast/16x16/actions/status_newupdate.png 444 root other
+f none usr/share/package-manager/icons/HighContrast/16x16/actions/status_notinstalled.png 444 root other
+d none usr/share/package-manager/icons/HighContrast/24x24 755 root bin
+d none usr/share/package-manager/icons/HighContrast/24x24/actions 755 root bin
+f none usr/share/package-manager/icons/HighContrast/24x24/actions/pm-install_update.png 444 root other
+f none usr/share/package-manager/icons/HighContrast/24x24/actions/pm-refresh.png 444 root other
+f none usr/share/package-manager/icons/HighContrast/24x24/actions/pm-remove.png 444 root other
+f none usr/share/package-manager/icons/HighContrast/24x24/actions/pm-update_all.png 444 root other
+d none usr/share/package-manager/icons/HighContrast/48x48 755 root bin
+d none usr/share/package-manager/icons/HighContrast/48x48/actions 755 root bin
+f none usr/share/package-manager/icons/HighContrast/48x48/actions/packagemanager.png 444 root other
+f none usr/share/package-manager/icons/HighContrast/48x48/actions/pm-install_update.png 444 root other
+f none usr/share/package-manager/icons/HighContrast/48x48/actions/pm-refresh.png 444 root other
+f none usr/share/package-manager/icons/HighContrast/48x48/actions/pm-remove.png 444 root other
+f none usr/share/package-manager/icons/HighContrast/48x48/actions/pm-update_all.png 444 root other
d none usr/share/package-manager/icons/hicolor 755 root bin
d none usr/share/package-manager/icons/hicolor/16x16 755 root bin
d none usr/share/package-manager/icons/hicolor/16x16/actions 755 root bin
@@ -78,18 +107,12 @@
f none usr/share/package-manager/icons/hicolor/16x16/actions/status_installed.png 444 root other
f none usr/share/package-manager/icons/hicolor/16x16/actions/status_newupdate.png 444 root other
f none usr/share/package-manager/icons/hicolor/16x16/actions/status_notinstalled.png 444 root other
-d none usr/share/package-manager/icons/hicolor/22x22 755 root bin
-d none usr/share/package-manager/icons/hicolor/22x22/actions 755 root bin
-f none usr/share/package-manager/icons/hicolor/22x22/actions/search.png 444 root other
d none usr/share/package-manager/icons/hicolor/24x24 755 root bin
d none usr/share/package-manager/icons/hicolor/24x24/actions 755 root bin
f none usr/share/package-manager/icons/hicolor/24x24/actions/pm-install_update.png 444 root other
f none usr/share/package-manager/icons/hicolor/24x24/actions/pm-refresh.png 444 root other
f none usr/share/package-manager/icons/hicolor/24x24/actions/pm-remove.png 444 root other
f none usr/share/package-manager/icons/hicolor/24x24/actions/pm-update_all.png 444 root other
-d none usr/share/package-manager/icons/hicolor/36x36 755 root bin
-d none usr/share/package-manager/icons/hicolor/36x36/actions 755 root bin
-f none usr/share/package-manager/icons/hicolor/36x36/actions/PM_package.png 444 root other
d none usr/share/package-manager/icons/hicolor/48x48 755 root bin
d none usr/share/package-manager/icons/hicolor/48x48/actions 755 root bin
f none usr/share/package-manager/icons/hicolor/48x48/actions/packagemanager.png 444 root other
