Commits

Christian Fischer committed 7a2285a

LogCat: moved images into resources package & version increment

  • Participants
  • Parent commits 6fb3ae5

Comments (0)

Files changed (3)

File logcat_moved_resources.patch

+# HG changeset patch
+# Parent 43650ea2334a619bc30ef8af370c986d33286126
+LogCat: Moved resource files into resources package
+
+diff --git a/logcat/src/org/nyerel/nbandroid/logcat/LogTopComponent.form b/logcat/src/org/nyerel/nbandroid/logcat/LogTopComponent.form
+--- a/logcat/src/org/nyerel/nbandroid/logcat/LogTopComponent.form
++++ b/logcat/src/org/nyerel/nbandroid/logcat/LogTopComponent.form
+@@ -52,7 +52,7 @@
+                       <ResourceString bundle="org/nyerel/nbandroid/logcat/Bundle.properties" key="LogTopComponent.jScrollPane1.TabConstraints.tabTitle_1" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                     </Property>
+                     <Property name="tabIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+-                      <Image iconType="3" name="/org/nyerel/nbandroid/logcat/1305106268_android.png"/>
++                      <Image iconType="3" name="/org/nyerel/nbandroid/logcat/resources/icon_android.png"/>
+                     </Property>
+                   </JTabbedPaneConstraints>
+                 </Constraint>
+@@ -88,7 +88,7 @@
+         <Component class="javax.swing.JButton" name="addFilterButton">
+           <Properties>
+             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+-              <Image iconType="3" name="/org/nyerel/nbandroid/logcat/funnel--plus.png"/>
++              <Image iconType="3" name="/org/nyerel/nbandroid/logcat/resources/bt_new_tab.png"/>
+             </Property>
+             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+               <ResourceString bundle="org/nyerel/nbandroid/logcat/Bundle.properties" key="LogTopComponent.addFilterButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+@@ -107,7 +107,7 @@
+         <Component class="javax.swing.JButton" name="removeTabButton">
+           <Properties>
+             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+-              <Image iconType="3" name="/org/nyerel/nbandroid/logcat/cross-button.png"/>
++              <Image iconType="3" name="/org/nyerel/nbandroid/logcat/resources/bt_close_tab.png"/>
+             </Property>
+             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+               <ResourceString bundle="org/nyerel/nbandroid/logcat/Bundle.properties" key="LogTopComponent.removeTabButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+@@ -127,7 +127,7 @@
+         <Component class="javax.swing.JToggleButton" name="autoScrollToggleButton">
+           <Properties>
+             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+-              <Image iconType="3" name="/org/nyerel/nbandroid/logcat/anchor.png"/>
++              <Image iconType="3" name="/org/nyerel/nbandroid/logcat/resources/bt_anchor.png"/>
+             </Property>
+             <Property name="selected" type="boolean" value="true"/>
+             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+@@ -144,7 +144,7 @@
+         <Component class="javax.swing.JButton" name="clearButton">
+           <Properties>
+             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+-              <Image iconType="3" name="/org/nyerel/nbandroid/logcat/bin_closed.png"/>
++              <Image iconType="3" name="/org/nyerel/nbandroid/logcat/resources/bt_clear_log.png"/>
+             </Property>
+             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+               <ResourceString bundle="org/nyerel/nbandroid/logcat/Bundle.properties" key="LogTopComponent.clearButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+diff --git a/logcat/src/org/nyerel/nbandroid/logcat/LogTopComponent.java b/logcat/src/org/nyerel/nbandroid/logcat/LogTopComponent.java
+--- a/logcat/src/org/nyerel/nbandroid/logcat/LogTopComponent.java
++++ b/logcat/src/org/nyerel/nbandroid/logcat/LogTopComponent.java
+@@ -409,7 +409,7 @@
+ 
+         jScrollPane1.setViewportView(jTable1);
+ 
+-        tabPane.addTab(org.openide.util.NbBundle.getMessage(LogTopComponent.class, "LogTopComponent.jScrollPane1.TabConstraints.tabTitle_1"), new javax.swing.ImageIcon(getClass().getResource("/org/nyerel/nbandroid/logcat/1305106268_android.png")), jScrollPane1); // NOI18N
++        tabPane.addTab(org.openide.util.NbBundle.getMessage(LogTopComponent.class, "LogTopComponent.jScrollPane1.TabConstraints.tabTitle_1"), new javax.swing.ImageIcon(getClass().getResource("/org/nyerel/nbandroid/logcat/resources/icon_android.png")), jScrollPane1); // NOI18N
+ 
+         panCenter.add(tabPane, java.awt.BorderLayout.CENTER);
+ 
+@@ -426,7 +426,7 @@
+         tbLeft.setOrientation(javax.swing.SwingConstants.VERTICAL);
+         tbLeft.setRollover(true);
+ 
+-        addFilterButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/nyerel/nbandroid/logcat/funnel--plus.png"))); // NOI18N
++        addFilterButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/nyerel/nbandroid/logcat/resources/bt_new_tab.png"))); // NOI18N
+         org.openide.awt.Mnemonics.setLocalizedText(addFilterButton, org.openide.util.NbBundle.getMessage(LogTopComponent.class, "LogTopComponent.addFilterButton.text")); // NOI18N
+         addFilterButton.setToolTipText(org.openide.util.NbBundle.getMessage(LogTopComponent.class, "LogTopComponent.addFilterButton.toolTipText")); // NOI18N
+         addFilterButton.setFocusable(false);
+@@ -439,7 +439,7 @@
+         });
+         tbLeft.add(addFilterButton);
+ 
+-        removeTabButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/nyerel/nbandroid/logcat/cross-button.png"))); // NOI18N
++        removeTabButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/nyerel/nbandroid/logcat/resources/bt_close_tab.png"))); // NOI18N
+         org.openide.awt.Mnemonics.setLocalizedText(removeTabButton, org.openide.util.NbBundle.getMessage(LogTopComponent.class, "LogTopComponent.removeTabButton.text")); // NOI18N
+         removeTabButton.setToolTipText(org.openide.util.NbBundle.getMessage(LogTopComponent.class, "LogTopComponent.removeTabButton.toolTipText")); // NOI18N
+         removeTabButton.setEnabled(false);
+@@ -453,7 +453,7 @@
+         });
+         tbLeft.add(removeTabButton);
+ 
+-        autoScrollToggleButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/nyerel/nbandroid/logcat/anchor.png"))); // NOI18N
++        autoScrollToggleButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/nyerel/nbandroid/logcat/resources/bt_anchor.png"))); // NOI18N
+         autoScrollToggleButton.setSelected(true);
+         org.openide.awt.Mnemonics.setLocalizedText(autoScrollToggleButton, org.openide.util.NbBundle.getMessage(LogTopComponent.class, "LogTopComponent.autoScrollToggleButton.text")); // NOI18N
+         autoScrollToggleButton.setToolTipText(org.openide.util.NbBundle.getMessage(LogTopComponent.class, "LogTopComponent.autoScrollToggleButton.toolTipText")); // NOI18N
+@@ -462,7 +462,7 @@
+         autoScrollToggleButton.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+         tbLeft.add(autoScrollToggleButton);
+ 
+-        clearButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/nyerel/nbandroid/logcat/bin_closed.png"))); // NOI18N
++        clearButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/nyerel/nbandroid/logcat/resources/bt_clear_log.png"))); // NOI18N
+         org.openide.awt.Mnemonics.setLocalizedText(clearButton, org.openide.util.NbBundle.getMessage(LogTopComponent.class, "LogTopComponent.clearButton.text")); // NOI18N
+         clearButton.setToolTipText(org.openide.util.NbBundle.getMessage(LogTopComponent.class, "LogTopComponent.clearButton.toolTipText")); // NOI18N
+         clearButton.setFocusable(false);
+diff --git a/logcat/src/org/nyerel/nbandroid/logcat/anchor.png b/logcat/src/org/nyerel/nbandroid/logcat/resources/bt_anchor.png
+rename from logcat/src/org/nyerel/nbandroid/logcat/anchor.png
+rename to logcat/src/org/nyerel/nbandroid/logcat/resources/bt_anchor.png
+diff --git a/logcat/src/org/nyerel/nbandroid/logcat/bin_closed.png b/logcat/src/org/nyerel/nbandroid/logcat/resources/bt_clear_log.png
+rename from logcat/src/org/nyerel/nbandroid/logcat/bin_closed.png
+rename to logcat/src/org/nyerel/nbandroid/logcat/resources/bt_clear_log.png
+diff --git a/logcat/src/org/nyerel/nbandroid/logcat/cross-button.png b/logcat/src/org/nyerel/nbandroid/logcat/resources/bt_close_tab.png
+rename from logcat/src/org/nyerel/nbandroid/logcat/cross-button.png
+rename to logcat/src/org/nyerel/nbandroid/logcat/resources/bt_close_tab.png
+diff --git a/logcat/src/org/nyerel/nbandroid/logcat/funnel--plus.png b/logcat/src/org/nyerel/nbandroid/logcat/resources/bt_new_tab.png
+rename from logcat/src/org/nyerel/nbandroid/logcat/funnel--plus.png
+rename to logcat/src/org/nyerel/nbandroid/logcat/resources/bt_new_tab.png
+diff --git a/logcat/src/org/nyerel/nbandroid/logcat/1305106268_android.png b/logcat/src/org/nyerel/nbandroid/logcat/resources/icon_android.png
+rename from logcat/src/org/nyerel/nbandroid/logcat/1305106268_android.png
+rename to logcat/src/org/nyerel/nbandroid/logcat/resources/icon_android.png
+diff --git a/logcat/src/org/nyerel/nbandroid/logcat/magnifier.png b/logcat/src/org/nyerel/nbandroid/logcat/resources/magnifier.png
+rename from logcat/src/org/nyerel/nbandroid/logcat/magnifier.png
+rename to logcat/src/org/nyerel/nbandroid/logcat/resources/magnifier.png

File logcat_version_1_8.patch

+# HG changeset patch
+# Parent 822ac0d62a74afca9b6e6d5b6fdf17b11c49a913
+LogCat: increased module version to 1.8
+
+diff -r 822ac0d62a74 -r b496a99860be logcat/manifest.mf
+--- a/logcat/manifest.mf	Fri Jul 22 00:51:16 2011 +0200
++++ b/logcat/manifest.mf	Fri Jul 22 00:54:07 2011 +0200
+@@ -4,6 +4,6 @@
+ OpenIDE-Module-Layer: org/nyerel/nbandroid/logcat/layer.xml
+ OpenIDE-Module-Localizing-Bundle: org/nyerel/nbandroid/logcat/Bundle.properties
+ AutoUpdate-Show-In-Client: false
+-OpenIDE-Module-Specification-Version: 1.7
++OpenIDE-Module-Specification-Version: 1.8
+ OpenIDE-Module-Java-Dependencies: Java > 1.6
+ 
 logcat_persistent_tabs.patch
 logcat_multiple_devices.patch
 logcat_colors.patch
+logcat_moved_resources.patch
+logcat_version_1_8.patch