Skip to content

Commit

Permalink
Task description made optional: disabled by default, enabled via
Browse files Browse the repository at this point in the history 
Preferences
  • Loading branch information
@vincenzocaselli
vincenzocaselli committed Feb 26, 2014
1 parent 4d2cc68 commit 00f5042
Show file tree
Hide file tree
Showing 4 changed files with 196 additions and 189 deletions.
2 changes: 2 additions & 0 deletions net.mornati.epomodoro/src/net/mornati/epomodoro/Activator.java
View file
Expand Up @@ -235,6 +235,7 @@ public void run() {
}
// countdown.setToolTipText(timer.getType() == PomodoroTimer.TYPE_PAUSE ? "Pause Timer" : "Work Timer");
countdown.setText(internalTimer.getFormatTime() + " " + taskDescription );
adjustSize(countdown);
}
}
if (Activator.getDefault().isShowDialog()) {
Expand All @@ -249,6 +250,7 @@ public void run() {
if (!countdown.isDisposed()) {
countdown.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_RED));
countdown.setText(sdf.format(new Date(timer.getConfigWorkTime())) + " " + taskDescription );
adjustSize(countdown);
}
}
scheduleTimer(changeInterval);
Expand Down
55 changes: 28 additions & 27 deletions ...mornati.epomodoro/src/net/mornati/epomodoro/preference/PomodoroPreferenceInitializer.java
View file
@@ -1,27 +1,28 @@
package net.mornati.epomodoro.preference;

import net.mornati.epomodoro.Activator;

import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
import org.eclipse.jface.preference.IPreferenceStore;

public class PomodoroPreferenceInitializer extends AbstractPreferenceInitializer {

public PomodoroPreferenceInitializer() {
}

@Override
public void initializeDefaultPreferences() {
IPreferenceStore store=Activator.getDefault().getPreferenceStore();
store.setDefault(PomodoroPreferencePage.GROUP_NAME, "MyTeam");
store.setDefault(PomodoroPreferencePage.CLIENT_NAME, "");
store.setDefault(PomodoroPreferencePage.POMODORO_TIME, "25");
store.setDefault(PomodoroPreferencePage.POMODORO_PAUSE, "5");
store.setDefault(PomodoroPreferencePage.WORK_PAUSE_AUTO_SWITCH, true);
store.setDefault(PomodoroPreferencePage.DISCARD_OWN_MESSAGE, false);
store.setDefault(PomodoroPreferencePage.SHOW_TIMER_STATUS_BAR, true);
store.setDefault(PomodoroPreferencePage.FORCE_IPV4, true);
store.setDefault(PomodoroPreferencePage.BIND_IP_ADDR, "");
}

}
package net.mornati.epomodoro.preference;

import net.mornati.epomodoro.Activator;

import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
import org.eclipse.jface.preference.IPreferenceStore;

public class PomodoroPreferenceInitializer extends AbstractPreferenceInitializer {

public PomodoroPreferenceInitializer() {
}

@Override
public void initializeDefaultPreferences() {
IPreferenceStore store=Activator.getDefault().getPreferenceStore();
store.setDefault(PomodoroPreferencePage.GROUP_NAME, "MyTeam");
store.setDefault(PomodoroPreferencePage.CLIENT_NAME, "");
store.setDefault(PomodoroPreferencePage.POMODORO_TIME, "25");
store.setDefault(PomodoroPreferencePage.POMODORO_PAUSE, "5");
store.setDefault(PomodoroPreferencePage.WORK_PAUSE_AUTO_SWITCH, true);
store.setDefault(PomodoroPreferencePage.DISCARD_OWN_MESSAGE, false);
store.setDefault(PomodoroPreferencePage.SHOW_TIMER_STATUS_BAR, true);
store.setDefault(PomodoroPreferencePage.FORCE_IPV4, true);
store.setDefault(PomodoroPreferencePage.POMODORO_DESCRIPTION, false);
store.setDefault(PomodoroPreferencePage.BIND_IP_ADDR, "");
}

}
94 changes: 48 additions & 46 deletions net.mornati.epomodoro/src/net/mornati/epomodoro/preference/PomodoroPreferencePage.java
View file
@@ -1,46 +1,48 @@
package net.mornati.epomodoro.preference;

import net.mornati.epomodoro.Activator;

import org.eclipse.jface.preference.BooleanFieldEditor;
import org.eclipse.jface.preference.FieldEditorPreferencePage;
import org.eclipse.jface.preference.IntegerFieldEditor;
import org.eclipse.jface.preference.StringFieldEditor;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;

public class PomodoroPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {

public static final String GROUP_NAME="GROUP_NAME";
public static final String CLIENT_NAME="CLIENT_NAME";
public static final String POMODORO_TIME="POMODORO_TIME";
public static final String POMODORO_PAUSE="POMODORO_PAUSE";
public static final String WORK_PAUSE_AUTO_SWITCH="WORK_PAUSE_AUTO_SWITCH";
public static final String DISCARD_OWN_MESSAGE="DISCARD_OWN_MESSAGE";
public static final String SHOW_TIMER_STATUS_BAR="SHOW_TIMER_STATUS_BAR";
public static final String FORCE_IPV4="FORCE_IPV4";
public static final String BIND_IP_ADDR="BIND_IP_ADDR";

public PomodoroPreferencePage() {
super(GRID);

}

public void createFieldEditors() {
addField(new StringFieldEditor(GROUP_NAME, "Team Name:", getFieldEditorParent()));
addField(new StringFieldEditor(CLIENT_NAME, "Your Name:", getFieldEditorParent()));
addField(new IntegerFieldEditor(POMODORO_TIME, "Pomodoro Time (minutes):", getFieldEditorParent()));
addField(new IntegerFieldEditor(POMODORO_PAUSE, "Pomodoro Pause (minutes):", getFieldEditorParent()));
addField(new BooleanFieldEditor(WORK_PAUSE_AUTO_SWITCH, "Auto start pause", getFieldEditorParent()));
addField(new BooleanFieldEditor(DISCARD_OWN_MESSAGE, "Discard own message in team table", getFieldEditorParent()));
addField(new BooleanFieldEditor(SHOW_TIMER_STATUS_BAR, "Show timer in status bar", getFieldEditorParent()));
addField(new BooleanFieldEditor(FORCE_IPV4, "Force IPv4", getFieldEditorParent()));
addField(new StringFieldEditor(BIND_IP_ADDR, "Bind IP Address (optional):", getFieldEditorParent()));
}

@Override
public void init(IWorkbench workbench) {
setPreferenceStore(Activator.getDefault().getPreferenceStore());
setDescription("ePomodoro Plugin Preference Page");
}
}
package net.mornati.epomodoro.preference;

import net.mornati.epomodoro.Activator;

import org.eclipse.jface.preference.BooleanFieldEditor;
import org.eclipse.jface.preference.FieldEditorPreferencePage;
import org.eclipse.jface.preference.IntegerFieldEditor;
import org.eclipse.jface.preference.StringFieldEditor;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;

public class PomodoroPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {

public static final String GROUP_NAME="GROUP_NAME";
public static final String CLIENT_NAME="CLIENT_NAME";
public static final String POMODORO_TIME="POMODORO_TIME";
public static final String POMODORO_PAUSE="POMODORO_PAUSE";
public static final String WORK_PAUSE_AUTO_SWITCH="WORK_PAUSE_AUTO_SWITCH";
public static final String DISCARD_OWN_MESSAGE="DISCARD_OWN_MESSAGE";
public static final String SHOW_TIMER_STATUS_BAR="SHOW_TIMER_STATUS_BAR";
public static final String FORCE_IPV4="FORCE_IPV4";
public static final String POMODORO_DESCRIPTION="POMODORO_DESCRIPTION";
public static final String BIND_IP_ADDR="BIND_IP_ADDR";

public PomodoroPreferencePage() {
super(GRID);

}

public void createFieldEditors() {
addField(new StringFieldEditor(GROUP_NAME, "Team Name:", getFieldEditorParent()));
addField(new StringFieldEditor(CLIENT_NAME, "Your Name:", getFieldEditorParent()));
addField(new IntegerFieldEditor(POMODORO_TIME, "Pomodoro Time (minutes):", getFieldEditorParent()));
addField(new IntegerFieldEditor(POMODORO_PAUSE, "Pomodoro Pause (minutes):", getFieldEditorParent()));
addField(new BooleanFieldEditor(WORK_PAUSE_AUTO_SWITCH, "Auto start pause", getFieldEditorParent()));
addField(new BooleanFieldEditor(DISCARD_OWN_MESSAGE, "Discard own message in team table", getFieldEditorParent()));
addField(new BooleanFieldEditor(SHOW_TIMER_STATUS_BAR, "Show timer in status bar", getFieldEditorParent()));
addField(new BooleanFieldEditor(FORCE_IPV4, "Force IPv4", getFieldEditorParent()));
addField(new BooleanFieldEditor(POMODORO_DESCRIPTION, "Set a Pomodoro description", getFieldEditorParent()));
addField(new StringFieldEditor(BIND_IP_ADDR, "Bind IP Address (optional):", getFieldEditorParent()));
}

@Override
public void init(IWorkbench workbench) {
setPreferenceStore(Activator.getDefault().getPreferenceStore());
setDescription("ePomodoro Plugin Preference Page");
}
}

0 comments on commit 00f5042

Please sign in to comment.