Update icons

git-svn-id: svn://svn.pgadmin.org/trunk/pgadmin3@8130 a7884b65-44f6-0310-8a51-81a127f17b15

diff --git a/pgadmin/frm/frmQuery.cpp b/pgadmin/frm/frmQuery.cpp
index 93fe8f80205a25139d8eb6c7d1e4e944395aff20..8b6c9e341c7f542bfb7db45590bc649fe820f6e9 100644 (file)
--- a/pgadmin/frm/frmQuery.cpp
+++ b/pgadmin/frm/frmQuery.cpp
@@ -54,7 +54,7 @@
 #include "pgscript/pgsApplication.h"
 
 // Icons
-#include "images/sql.xpm"
+#include "images/sql-32.xpm"
 
 // Bitmaps
 #include "images/file_new.xpm"
@@ -217,7 +217,7 @@ pgsTimer(new pgScriptTimer(this))
 
     SetMinSize(wxSize(450,300));
 
-    SetIcon(wxIcon(sql_xpm));
+    SetIcon(wxIcon(sql_32_xpm));
     wxWindowBase::SetFont(settings->GetSystemFont());
     menuBar = new wxMenuBar();
 
@@ -2582,7 +2582,7 @@ bool queryToolDataFactory::CheckEnable(pgObject *obj)
 queryToolFactory::queryToolFactory(menuFactoryList *list, wxMenu *mnu, ctlMenuToolbar *toolbar) : queryToolBaseFactory(list)
 {
     mnu->Append(id, _("&Query tool\tCtrl-E"), _("Execute arbitrary SQL queries."));
-    toolbar->AddTool(id, _("Query tool\tCtrl-E"), wxBitmap(sql_xpm), _("Execute arbitrary SQL queries."), wxITEM_NORMAL);
+    toolbar->AddTool(id, _("Query tool\tCtrl-E"), wxBitmap(sql_32_xpm), _("Execute arbitrary SQL queries."), wxITEM_NORMAL);
 }
 
 
@@ -2599,7 +2599,7 @@ queryToolSqlFactory::queryToolSqlFactory(menuFactoryList *list, wxMenu *mnu, ctl
 {
     mnu->Append(id, _("CREATE script"), _("Start Query tool with CREATE script."));
     if (toolbar)
-        toolbar->AddTool(id, _("CREATE script"), wxBitmap(sql_xpm), _("Start query tool with CREATE script."), wxITEM_NORMAL);
+        toolbar->AddTool(id, _("CREATE script"), wxBitmap(sql_32_xpm), _("Start query tool with CREATE script."), wxITEM_NORMAL);
 }
 
 

diff --git a/pgadmin/include/images/module.mk b/pgadmin/include/images/module.mk
index fced070689650a1e39ec373198b19abf88b06b9e..97880bd21c815bddc8445bc8984abcb0c1afee5f 100644 (file)
--- a/pgadmin/include/images/module.mk
+++ b/pgadmin/include/images/module.mk
@@ -62,8 +62,6 @@ pgadmin3_SOURCES += \
        $(srcdir)/include/images/edit_find.xpm \
        $(srcdir)/include/images/edit_redo.xpm \
        $(srcdir)/include/images/edit_undo.xpm \
-       $(srcdir)/include/images/elephant32.xpm \
-       $(srcdir)/include/images/elephant48.xpm \
        $(srcdir)/include/images/enumeration.xpm \
        $(srcdir)/include/images/enumerations.xpm \
        $(srcdir)/include/images/ex_aggregate.xpm \
@@ -157,7 +155,8 @@ pgadmin3_SOURCES += \
        $(srcdir)/include/images/parser.xpm \
        $(srcdir)/include/images/parsers.xpm \
        $(srcdir)/include/images/plugins.xpm \
-       $(srcdir)/include/images/pgAdmin3.xpm \
+       $(srcdir)/include/images/pgAdmin3-16.xpm \
+       $(srcdir)/include/images/pgAdmin3-32.xpm \
        $(srcdir)/include/images/primarykey.xpm \
        $(srcdir)/include/images/procedures.xpm \
        $(srcdir)/include/images/procedure.xpm \
@@ -204,8 +203,8 @@ pgadmin3_SOURCES += \
        $(srcdir)/include/images/slsubscriptions.xpm \
        $(srcdir)/include/images/sortfilter.xpm \
        $(srcdir)/include/images/splash.xpm \
-       $(srcdir)/include/images/sql.ico \
-       $(srcdir)/include/images/sql.xpm \
+       $(srcdir)/include/images/sql-16.xpm \
+       $(srcdir)/include/images/sql-32.xpm \
        $(srcdir)/include/images/statistics.xpm \
        $(srcdir)/include/images/step.xpm \
        $(srcdir)/include/images/steps.xpm \
@@ -252,4 +251,8 @@ pgadmin3_SOURCES += \
 
 EXTRA_DIST += \
        $(srcdir)/include/images/module.mk \
-       $(srcdir)/include/images/pgAdmin3.ico
+       $(srcdir)/include/images/pgAdmin3.ico \
+       $(srcdir)/include/images/pgAdmin3.png \
+       $(srcdir)/include/images/sql.ico \
+       $(srcdir)/include/images/sql.png
+

diff --git a/pgadmin/include/images/sql.ico b/pgadmin/include/images/sql.ico
old mode 100644 (file)
new mode 100755 (executable)
index aedf78b..9c3cef9
Binary files a/pgadmin/include/images/sql.ico and b/pgadmin/include/images/sql.ico differ

diff --git a/pkg/suse/pgadmin3.spec.in b/pkg/suse/pgadmin3.spec.in
index 44fdfeb2520afdbd9687af8045d48560f0931c56..f183c036287bfc365ca7308aec1d539f691d62fc 100644 (file)
--- a/pkg/suse/pgadmin3.spec.in
+++ b/pkg/suse/pgadmin3.spec.in
@@ -49,7 +49,7 @@ make install DESTDIR=%{buildroot}
 strip --strip-debug %{buildroot}/%{_bindir}/%{name}
 chmod +x $RPM_BUILD_ROOT/%{_bindir}/pgadmin3
 
-cp -f ./pgadmin/include/images/elephant32.xpm %{buildroot}/%{_datadir}/%{name}/%{name}.xpm
+cp -f ./pgadmin/include/images/pgAdmin3.png %{buildroot}/%{_datadir}/%{name}/%{name}.png
 cp -f ./pkg/%{name}.desktop %{buildroot}/%{_datadir}/%{name}/%{name}.desktop
 
 mkdir -p %{buildroot}/%{_datadir}/applications