- Old images removed
authorAlex Kirhenshtein <alk@netxms.org>
Mon, 17 Jan 2011 03:49:17 +0000 (03:49 +0000)
committerAlex Kirhenshtein <alk@netxms.org>
Mon, 17 Jan 2011 03:49:17 +0000 (03:49 +0000)
- "Network Objects" category added to image library
- images from Network Maps plugin added into image library

42 files changed:
.gitattributes
images/Makefile.am
images/atm.png [new file with mode: 0644]
images/cluster.ico [deleted file]
images/cluster.png [deleted file]
images/condition.ico [deleted file]
images/condition.png [deleted file]
images/generic_printer.ico [deleted file]
images/generic_printer.png [deleted file]
images/hsm.png [new file with mode: 0644]
images/interface.ico [deleted file]
images/interface.png [deleted file]
images/network.ico [deleted file]
images/network.png [deleted file]
images/network_service.ico [deleted file]
images/network_service.png [deleted file]
images/node.ico [deleted file]
images/node.png
images/node_group.ico [deleted file]
images/node_group.png [deleted file]
images/printer.png [new file with mode: 0644]
images/router.png [new file with mode: 0644]
images/server.png [new file with mode: 0644]
images/service.ico [deleted file]
images/service.png
images/subnet.ico [deleted file]
images/subnet.png [deleted file]
images/switch.png [new file with mode: 0644]
images/template.ico [deleted file]
images/template.png [deleted file]
images/template_group.ico [deleted file]
images/template_group.png [deleted file]
images/template_root.ico [deleted file]
images/template_root.png [deleted file]
images/unknown.png [new file with mode: 0644]
images/vpnc.ico [deleted file]
images/vpnc.png [deleted file]
images/zone.ico [deleted file]
images/zone.png [deleted file]
include/netxmsdb.h
sql/setup.in
src/server/tools/nxdbmgr/upgrade.cpp

index cfe321e..abe8f85 100644 (file)
@@ -42,36 +42,15 @@ doc/manuals/netxms_user_manual.odt -text
 doc/manuals/netxms_webapi_reference.odt -text
 doc/manuals/nxcp_reference.odt -text
 doc/misc/agent_parameters.xlsx -text
-images/cluster.ico -text
-images/cluster.png -text
-images/condition.ico -text
-images/condition.png -text
-images/generic_printer.ico -text
-images/generic_printer.png -text
-images/interface.ico -text
-images/interface.png -text
-images/network.ico -text
-images/network.png -text
-images/network_service.ico -text
-images/network_service.png -text
-images/node.ico -text
+images/atm.png -text
+images/hsm.png -text
 images/node.png -text
-images/node_group.ico -text
-images/node_group.png -text
-images/service.ico -text
+images/printer.png -text
+images/router.png -text
+images/server.png -text
 images/service.png -text
-images/subnet.ico -text
-images/subnet.png -text
-images/template.ico -text
-images/template.png -text
-images/template_group.ico -text
-images/template_group.png -text
-images/template_root.ico -text
-images/template_root.png -text
-images/vpnc.ico -text
-images/vpnc.png -text
-images/zone.ico -text
-images/zone.png -text
+images/switch.png -text
+images/unknown.png -text
 include/netxms_isc.h -text
 include/nxdbapi.h -text
 include/nxlpapi.h -text
index b66d1dd..da224e1 100644 (file)
 imagesdir=$(pkgdatadir)/images
 
 images_DATA = \
-    cluster.ico cluster.png \
-    condition.ico condition.png \
-    generic_printer.ico generic_printer.png \
-    interface.ico interface.png \
-    network.ico network.png \
-    network_service.ico network_service.png \
-    node_group.ico node_group.png \
-    node.ico node.png \
-    service.ico service.png \
-    subnet.ico subnet.png \
-    template_group.ico template_group.png \
-    template.ico template.png \
-    template_root.ico template_root.png \
-    vpnc.ico vpnc.png \
-    zone.ico zone.png
+       atm.png hsm.png node.png printer.png router.png server.png \
+       service.png switch.png unknown.png
 
 EXTRA_DIST=$(images_DATA)
diff --git a/images/atm.png b/images/atm.png
new file mode 100644 (file)
index 0000000..5682607
Binary files /dev/null and b/images/atm.png differ
diff --git a/images/cluster.ico b/images/cluster.ico
deleted file mode 100644 (file)
index 8334799..0000000
Binary files a/images/cluster.ico and /dev/null differ
diff --git a/images/cluster.png b/images/cluster.png
deleted file mode 100644 (file)
index 1e01e1c..0000000
Binary files a/images/cluster.png and /dev/null differ
diff --git a/images/condition.ico b/images/condition.ico
deleted file mode 100644 (file)
index 14ce115..0000000
Binary files a/images/condition.ico and /dev/null differ
diff --git a/images/condition.png b/images/condition.png
deleted file mode 100644 (file)
index 96cdb6f..0000000
Binary files a/images/condition.png and /dev/null differ
diff --git a/images/generic_printer.ico b/images/generic_printer.ico
deleted file mode 100644 (file)
index 11b3b8e..0000000
Binary files a/images/generic_printer.ico and /dev/null differ
diff --git a/images/generic_printer.png b/images/generic_printer.png
deleted file mode 100644 (file)
index dcd91aa..0000000
Binary files a/images/generic_printer.png and /dev/null differ
diff --git a/images/hsm.png b/images/hsm.png
new file mode 100644 (file)
index 0000000..0f949be
Binary files /dev/null and b/images/hsm.png differ
diff --git a/images/interface.ico b/images/interface.ico
deleted file mode 100644 (file)
index a6e7bf7..0000000
Binary files a/images/interface.ico and /dev/null differ
diff --git a/images/interface.png b/images/interface.png
deleted file mode 100644 (file)
index dab5cf9..0000000
Binary files a/images/interface.png and /dev/null differ
diff --git a/images/network.ico b/images/network.ico
deleted file mode 100644 (file)
index b80e08a..0000000
Binary files a/images/network.ico and /dev/null differ
diff --git a/images/network.png b/images/network.png
deleted file mode 100644 (file)
index 6c7ae74..0000000
Binary files a/images/network.png and /dev/null differ
diff --git a/images/network_service.ico b/images/network_service.ico
deleted file mode 100644 (file)
index c78da04..0000000
Binary files a/images/network_service.ico and /dev/null differ
diff --git a/images/network_service.png b/images/network_service.png
deleted file mode 100644 (file)
index 0d0d447..0000000
Binary files a/images/network_service.png and /dev/null differ
diff --git a/images/node.ico b/images/node.ico
deleted file mode 100644 (file)
index 2e5c3b8..0000000
Binary files a/images/node.ico and /dev/null differ
index 15cc799..9fdfc6b 100644 (file)
Binary files a/images/node.png and b/images/node.png differ
diff --git a/images/node_group.ico b/images/node_group.ico
deleted file mode 100644 (file)
index 0cae79f..0000000
Binary files a/images/node_group.ico and /dev/null differ
diff --git a/images/node_group.png b/images/node_group.png
deleted file mode 100644 (file)
index 8534374..0000000
Binary files a/images/node_group.png and /dev/null differ
diff --git a/images/printer.png b/images/printer.png
new file mode 100644 (file)
index 0000000..db1d3c3
Binary files /dev/null and b/images/printer.png differ
diff --git a/images/router.png b/images/router.png
new file mode 100644 (file)
index 0000000..1a3f540
Binary files /dev/null and b/images/router.png differ
diff --git a/images/server.png b/images/server.png
new file mode 100644 (file)
index 0000000..4b4c87d
Binary files /dev/null and b/images/server.png differ
diff --git a/images/service.ico b/images/service.ico
deleted file mode 100644 (file)
index 4083303..0000000
Binary files a/images/service.ico and /dev/null differ
index d66da07..0cee323 100644 (file)
Binary files a/images/service.png and b/images/service.png differ
diff --git a/images/subnet.ico b/images/subnet.ico
deleted file mode 100644 (file)
index 5b0649d..0000000
Binary files a/images/subnet.ico and /dev/null differ
diff --git a/images/subnet.png b/images/subnet.png
deleted file mode 100644 (file)
index 51e1f2f..0000000
Binary files a/images/subnet.png and /dev/null differ
diff --git a/images/switch.png b/images/switch.png
new file mode 100644 (file)
index 0000000..b0b6502
Binary files /dev/null and b/images/switch.png differ
diff --git a/images/template.ico b/images/template.ico
deleted file mode 100644 (file)
index d58c5f0..0000000
Binary files a/images/template.ico and /dev/null differ
diff --git a/images/template.png b/images/template.png
deleted file mode 100644 (file)
index 6fcb64b..0000000
Binary files a/images/template.png and /dev/null differ
diff --git a/images/template_group.ico b/images/template_group.ico
deleted file mode 100644 (file)
index a2956ad..0000000
Binary files a/images/template_group.ico and /dev/null differ
diff --git a/images/template_group.png b/images/template_group.png
deleted file mode 100644 (file)
index fc214b6..0000000
Binary files a/images/template_group.png and /dev/null differ
diff --git a/images/template_root.ico b/images/template_root.ico
deleted file mode 100644 (file)
index eb5ee22..0000000
Binary files a/images/template_root.ico and /dev/null differ
diff --git a/images/template_root.png b/images/template_root.png
deleted file mode 100644 (file)
index 08c1edf..0000000
Binary files a/images/template_root.png and /dev/null differ
diff --git a/images/unknown.png b/images/unknown.png
new file mode 100644 (file)
index 0000000..77c86d1
Binary files /dev/null and b/images/unknown.png differ
diff --git a/images/vpnc.ico b/images/vpnc.ico
deleted file mode 100644 (file)
index 5c84fa3..0000000
Binary files a/images/vpnc.ico and /dev/null differ
diff --git a/images/vpnc.png b/images/vpnc.png
deleted file mode 100644 (file)
index 51ea27c..0000000
Binary files a/images/vpnc.png and /dev/null differ
diff --git a/images/zone.ico b/images/zone.ico
deleted file mode 100644 (file)
index ff29b28..0000000
Binary files a/images/zone.ico and /dev/null differ
diff --git a/images/zone.png b/images/zone.png
deleted file mode 100644 (file)
index e8f84b2..0000000
Binary files a/images/zone.png and /dev/null differ
index a876fa6..28bd78e 100644 (file)
@@ -23,6 +23,6 @@
 #ifndef _netxmsdb_h
 #define _netxmsdb_h
 
-#define DB_FORMAT_VERSION   219
+#define DB_FORMAT_VERSION   220
 
 #endif
index cd59efe..46698a7 100644 (file)
@@ -369,3 +369,27 @@ INSERT INTO oid_to_type (pair_id,snmp_oid,node_type,node_flags)
    VALUES (30,'.1.3.6.1.4.1.45.3.47.*',NODE_TYPE_NORTEL_OPTERA,0);
 INSERT INTO oid_to_type (pair_id,snmp_oid,node_type,node_flags)
    VALUES (31,'.1.3.6.1.4.1.45.3.48.*',NODE_TYPE_NORTEL_OPTERA,0);
+
+   
+/*
+** Stock image library images
+*/
+
+INSERT INTO images (image_name, category, protected)
+   VALUES('atm.png', 'Network Objects', 1);
+INSERT INTO images (image_name, category, protected)
+   VALUES('hsm.png', 'Network Objects', 1);
+INSERT INTO images (image_name, category, protected)
+   VALUES('node.png', 'Network Objects', 1);
+INSERT INTO images (image_name, category, protected)
+   VALUES('printer.png', 'Network Objects', 1);
+INSERT INTO images (image_name, category, protected)
+   VALUES('router.png', 'Network Objects', 1);
+INSERT INTO images (image_name, category, protected)
+   VALUES('server.png', 'Network Objects', 1);
+INSERT INTO images (image_name, category, protected)
+   VALUES('service.png', 'Network Objects', 1);
+INSERT INTO images (image_name, category, protected)
+   VALUES('switch.png', 'Network Objects', 1);
+INSERT INTO images (image_name, category, protected)
+   VALUES('unknown.png', 'Network Objects', 1);
index 37f17c1..8e8cc58 100644 (file)
@@ -248,6 +248,31 @@ static BOOL SetColumnNullable(const TCHAR *table, const TCHAR *column, const TCH
 }
 
 
+//
+// Upgrade from V219 to V220
+//
+
+static BOOL H_UpgradeFromV219(int currVersion, int newVersion)
+{
+   static TCHAR batch[] = 
+      _T("INSERT INTO images (image_name, category, protected) VALUES('atm.png', 'Network Objects', 1);\n")
+      _T("INSERT INTO images (image_name, category, protected) VALUES('hsm.png', 'Network Objects', 1);\n")
+      _T("INSERT INTO images (image_name, category, protected) VALUES('node.png', 'Network Objects', 1);\n")
+      _T("INSERT INTO images (image_name, category, protected) VALUES('printer.png', 'Network Objects', 1);\n")
+      _T("INSERT INTO images (image_name, category, protected) VALUES('router.png', 'Network Objects', 1);\n")
+      _T("INSERT INTO images (image_name, category, protected) VALUES('server.png', 'Network Objects', 1);\n")
+      _T("INSERT INTO images (image_name, category, protected) VALUES('service.png', 'Network Objects', 1);\n")
+      _T("INSERT INTO images (image_name, category, protected) VALUES('switch.png', 'Network Objects', 1);\n")
+      _T("INSERT INTO images (image_name, category, protected) VALUES('unknown.png', 'Network Objects', 1);\n")
+      _T("<END>");
+
+   CHK_EXEC(SQLBatch(batch));
+
+   CHK_EXEC(SQLQuery(_T("UPDATE metadata SET var_value='220' WHERE var_name='SchemaVersion'")));
+   return TRUE;
+}
+
+
 //
 // Upgrade from V218 to V219
 //