Skip to content

Commit 173ca8b

Browse files
author
davidgraeff
committed
Remove duplicated strings/en; Feature: Allow do remove all groups at once
1 parent dd2fe4e commit 173ca8b

File tree

5 files changed

+34
-105
lines changed

5 files changed

+34
-105
lines changed

res/values-de/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@
8080
<string name="groupname">Gruppename</string>
8181
<string name="groupname_long">Bitte geben Sie einen neuen Gruppennamen ein</string>
8282
<string name="shortcut_show_mainwindow">Zeige Hauptfenster</string>
83+
<string name="delete_all_groups">Alle Gruppen löschen?</string>
84+
<string name="confirmation_delete_all_groups">Sind Sie sicher, dass Sie alle Gruppen löschen wollen?</string>
8385

8486
<string name="off">Aus</string>
8587
<string name="on">An</string>

res/values-en/strings.xml

Lines changed: 0 additions & 94 deletions
This file was deleted.

res/values/strings.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<string name="default_device_name">New device</string>
6060
<string name="copy_of">Copy of %s</string>
6161

62-
<string name="confirmation_delete_device">Are you sure you want to delete this device?</string>
62+
<string name="confirmation_delete_device">Delete all devices?</string>
6363
<string name="confirmation_delete_all_devices">Are you sure you want to delete all devices?</string>
6464

6565
<string name="preference_standard_send_port">Standard UDP port for sending queries</string>
@@ -80,6 +80,8 @@
8080
<string name="groupname">Group name</string>
8181
<string name="groupname_long">Please enter a new group name</string>
8282
<string name="shortcut_show_mainwindow">Show mainwindow on execution</string>
83+
<string name="delete_all_groups">Delete all groups?</string>
84+
<string name="confirmation_delete_all_groups">Are you sure you want to delete all groups?</string>
8385

8486
<string name="off">Off</string>
8587
<string name="on">On</string>

src/oly/netpowerctrl/listadapter/GroupListAdapter.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,4 +132,10 @@ public void onClick(DialogInterface dialog, int whichButton) {
132132
return true;
133133
}
134134

135+
public void deleteAll() {
136+
groups.clear();
137+
SharedPrefs.SaveGroups(groups, that.context);
138+
that.notifyDataSetChanged();
139+
}
140+
135141
}

src/oly/netpowerctrl/main/NetpowerctrlActivity.java

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -175,19 +175,21 @@ protected void onPause() {
175175
public boolean onCreateOptionsMenu(Menu menu) {
176176
super.onCreateOptionsMenu(menu);
177177
menu.add(0, R.id.menu_add_device, 0, R.string.menu_add_device).setIcon(R.drawable.ic_menu_add);
178-
menu.add(0, R.id.menu_delete_all_devices, 0, R.string.menu_delete_all).setIcon(R.drawable.ic_menu_delete);
179178
menu.add(0, R.id.menu_requery, 0, R.string.requery).setIcon(R.drawable.ic_menu_refresh);
179+
menu.add(0, R.id.menu_delete_all_devices, 0, R.string.menu_delete_all).setIcon(R.drawable.ic_menu_delete);
180180
menu.add(0, R.id.menu_preferences, 0, R.string.menu_preferences).setIcon(R.drawable.ic_menu_preferences);
181181
menu.add(0, R.id.menu_about, 0, R.string.menu_about).setIcon(R.drawable.ic_menu_info_details);
182182
menu.findItem(R.id.menu_add_device).setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
183183
menu.findItem(R.id.menu_requery).setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
184+
menu.findItem(R.id.menu_delete_all_devices).setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
184185
return true;
185186
}
186187

187188
@Override
188189
public boolean onPrepareOptionsMenu(Menu menu) {
189190
TabHost th = (TabHost)findViewById(android.R.id.tabhost);
190191
menu.findItem(R.id.menu_add_device).setVisible(!th.getCurrentTabTag().equals("outlets"));
192+
menu.findItem(R.id.menu_delete_all_devices).setVisible(!th.getCurrentTabTag().equals("outlets"));
191193
super.onPrepareOptionsMenu(menu);
192194
return true;
193195
}
@@ -218,15 +220,31 @@ public boolean onOptionsItemSelected(MenuItem item) {
218220
}
219221

220222
case R.id.menu_delete_all_devices: {
221-
new AlertDialog.Builder(this)
222-
.setTitle(R.string.delete_all_devices)
223-
.setMessage(R.string.confirmation_delete_all_devices)
223+
TabHost th = (TabHost)findViewById(android.R.id.tabhost);
224+
if (th.getCurrentTabTag().equals("devices")) {
225+
new AlertDialog.Builder(this)
226+
.setTitle(R.string.delete_all_devices)
227+
.setMessage(R.string.confirmation_delete_all_devices)
228+
.setIcon(android.R.drawable.ic_dialog_alert)
229+
.setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
230+
public void onClick(DialogInterface dialog, int whichButton) {
231+
// Delete all devices
232+
alDevices.clear();
233+
SaveConfiguredDevices();
234+
}})
235+
.setNegativeButton(android.R.string.no, null).show();
236+
} else if (th.getCurrentTabTag().equals("groups")) {
237+
new AlertDialog.Builder(this)
238+
.setTitle(R.string.delete_all_groups)
239+
.setMessage(R.string.confirmation_delete_all_groups)
224240
.setIcon(android.R.drawable.ic_dialog_alert)
225241
.setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
226242
public void onClick(DialogInterface dialog, int whichButton) {
227-
deleteAllDevices();
243+
// Delete all groups
244+
adpGroups.deleteAll();
228245
}})
229246
.setNegativeButton(android.R.string.no, null).show();
247+
}
230248
return true;
231249
}
232250

@@ -362,11 +380,6 @@ public void deleteDevice(int position) {
362380
SaveConfiguredDevices();
363381
}
364382

365-
public void deleteAllDevices() {
366-
alDevices.clear();
367-
SaveConfiguredDevices();
368-
}
369-
370383
private BroadcastReceiver onDeviceDiscovered= new BroadcastReceiver() {
371384
@Override
372385
synchronized public void onReceive(Context context, Intent intent) {

0 commit comments

Comments
 (0)