SEBSERV-95

src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/TableFieldBuilder.java

@@ -41,6 +41,9 @@ import ch.ethz.seb.sebserver.gui.widget.WidgetFactory.ImageIcon;
 @GuiProfile
 public class TableFieldBuilder extends AbstractTableFieldBuilder {
 
+    private static final String ADD_TOOLTIP_SUFFIX = ".add.tooltip";
+    private static final String REMOVE_TOOLTIP_SUFFIX = ".remove.tooltip";
+
     protected TableFieldBuilder(
             final RestService restService,
             final WidgetFactory widgetFactory) {
@@ -88,8 +91,12 @@ public class TableFieldBuilder extends AbstractTableFieldBuilder {
 
         if (!viewContext.readonly) {
             TableColumn column = new TableColumn(table, SWT.NONE);
-            column.setImage(ImageIcon.ADD_BOX.getImage(parent.getDisplay()));
+            column.setImage(ImageIcon.ADD_BOX_WHITE.getImage(parent.getDisplay()));
-
+            column.setToolTipText(viewContext.i18nSupport.getText(
+                    ExamConfigurationService.ATTRIBUTE_LABEL_LOC_TEXT_PREFIX +
+                            attribute.name +
+                            ADD_TOOLTIP_SUFFIX,
+                    "Add new"));
             column.setWidth(20);
             column.setResizable(false);
             column.setMoveable(false);
@@ -99,8 +106,12 @@ public class TableFieldBuilder extends AbstractTableFieldBuilder {
             });
 
             column = new TableColumn(table, SWT.NONE);
-            column.setImage(ImageIcon.REMOVE_BOX.getImage(parent.getDisplay()));
+            column.setImage(ImageIcon.REMOVE_BOX_WHITE.getImage(parent.getDisplay()));
-
+            column.setToolTipText(viewContext.i18nSupport.getText(
+                    ExamConfigurationService.ATTRIBUTE_LABEL_LOC_TEXT_PREFIX +
+                            attribute.name +
+                            REMOVE_TOOLTIP_SUFFIX,
+                    "Remove Selected"));
             column.setWidth(20);
             column.setResizable(false);
             column.setMoveable(false);

src/main/java/ch/ethz/seb/sebserver/gui/widget/WidgetFactory.java

@@ -67,7 +67,9 @@ public class WidgetFactory {
         ADD("add.png"),
         REMOVE("remove.png"),
         ADD_BOX("add_box.png"),
+        ADD_BOX_WHITE("add_box_w.png"),
         REMOVE_BOX("remove_box.png"),
+        REMOVE_BOX_WHITE("remove_box_w.png"),
         EDIT("edit.png"),
         EDIT_SETTINGS("settings.png"),
         TEST("test.png"),

src/main/resources/messages.properties

@@ -493,7 +493,6 @@ sebserver.examconfig.props.form.views.registry=Registry
 sebserver.examconfig.props.form.views.hooked_keys=Hooked Keys
 
 
-
 sebserver.examconfig.props.label.hashedAdminPassword=Administrator password
 sebserver.examconfig.props.label.hashedAdminPassword.confirm=Confirm password
 sebserver.examconfig.props.label.allowQuit=Allow user to quit SEB
@@ -694,6 +693,8 @@ sebserver.examconfig.props.label.restartExamPasswordProtected.tooltip=The quit/r
 sebserver.examconfig.props.label.allowSwitchToApplications=Allow switching to third party application (Mac)
 sebserver.examconfig.props.label.allowSwitchToApplications.tooltip=Decreases security of the kiosk mode by allowing process switcher (Cmd+Tab).\nThe blacked out background of SEB also doesn't cover some alerts and modal windows in this mode.
 sebserver.examconfig.props.label.allowFlashFullscreen=Allow Flash to switch to fullscreen mode (Mac)
+sebserver.examconfig.props.label.permittedProcesses.add.tooltip=Add permitted process
+sebserver.examconfig.props.label.permittedProcesses.remove.tooltip=Remove selected permitted process
 sebserver.examconfig.props.label.permittedProcesses.row.title=Permitted Processes
 sebserver.examconfig.props.label.permittedProcesses=Permitted Processes
 sebserver.examconfig.props.label.permittedProcesses.active=Active
@@ -728,6 +729,8 @@ sebserver.examconfig.props.label.permittedProcesses.allowUserToChooseApp=Allow u
 sebserver.examconfig.props.label.permittedProcesses.strongKill=Force quit (risk of data loss)
 sebserver.examconfig.props.label.permittedProcesses.strongKill.tooltip=Terminate process in a not-nice way, which may cause data loss if the application had unsaved data
 
+sebserver.examconfig.props.label.prohibitedProcesses.add.tooltip=Add prohibited process
+sebserver.examconfig.props.label.prohibitedProcesses.remove.tooltip=Remove selected prohibited process
 sebserver.examconfig.props.label.prohibitedProcesses.row.title=Prohibited Processes
 sebserver.examconfig.props.label.prohibitedProcesses=Prohibited Processes
 sebserver.examconfig.props.label.prohibitedProcesses.active=Active
@@ -746,7 +749,7 @@ sebserver.examconfig.props.label.prohibitedProcesses.identifier.tooltip=Title of
 sebserver.examconfig.props.label.prohibitedProcesses.strongKill=Force quit (risk of data loss)
 sebserver.examconfig.props.label.prohibitedProcesses.strongKill.tooltip=Terminate process in a not-nice way, which may cause data loss if the application had unsaved data
 
-sebserver.examconfig.props.group.urlFilter=Fitler
+sebserver.examconfig.props.group.urlFilter=Filter
 sebserver.examconfig.props.label.URLFilterEnable=Activate URL Filtering
 sebserver.examconfig.props.label.URLFilterEnableContentFilter=Filter also embedded content
 sebserver.examconfig.props.label.URLFilterRules=Filter
@@ -757,6 +760,8 @@ sebserver.examconfig.props.label.URLFilterRules.expression=Expression
 sebserver.examconfig.props.label.URLFilterRules.action=Action
 sebserver.examconfig.props.label.URLFilterRules.action.0=Block
 sebserver.examconfig.props.label.URLFilterRules.action.1=Allow
+sebserver.examconfig.props.label.URLFilterRules.add.tooltip=Add new URL Filter
+sebserver.examconfig.props.label.URLFilterRules.remove.tooltip=Remove selected URL Filter
 
 sebserver.examconfig.props.group.proxies=Proxies
 sebserver.examconfig.props.label.proxySettingsPolicy=proxy settings policy
@@ -1121,4 +1126,3 @@ sebserver.seblogs.form.column.exam.description=Description
 sebserver.seblogs.form.column.exam.type=Type
 sebserver.seblogs.form.column.exam.startTime=Start Time
 sebserver.seblogs.form.column.exam.endTime=End Time
-

src/main/resources/messages_en.properties

@@ -493,7 +493,6 @@ sebserver.examconfig.props.form.views.registry=Registry
 sebserver.examconfig.props.form.views.hooked_keys=Hooked Keys
 
 
-
 sebserver.examconfig.props.label.hashedAdminPassword=Administrator password
 sebserver.examconfig.props.label.hashedAdminPassword.confirm=Confirm password
 sebserver.examconfig.props.label.allowQuit=Allow user to quit SEB
@@ -694,6 +693,8 @@ sebserver.examconfig.props.label.restartExamPasswordProtected.tooltip=The quit/r
 sebserver.examconfig.props.label.allowSwitchToApplications=Allow switching to third party application (Mac)
 sebserver.examconfig.props.label.allowSwitchToApplications.tooltip=Decreases security of the kiosk mode by allowing process switcher (Cmd+Tab).\nThe blacked out background of SEB also doesn't cover some alerts and modal windows in this mode.
 sebserver.examconfig.props.label.allowFlashFullscreen=Allow Flash to switch to fullscreen mode (Mac)
+sebserver.examconfig.props.label.permittedProcesses.add.tooltip=Add permitted process
+sebserver.examconfig.props.label.permittedProcesses.remove.tooltip=Remove selected permitted process
 sebserver.examconfig.props.label.permittedProcesses.row.title=Permitted Processes
 sebserver.examconfig.props.label.permittedProcesses=Permitted Processes
 sebserver.examconfig.props.label.permittedProcesses.active=Active
@@ -728,6 +729,8 @@ sebserver.examconfig.props.label.permittedProcesses.allowUserToChooseApp=Allow u
 sebserver.examconfig.props.label.permittedProcesses.strongKill=Force quit (risk of data loss)
 sebserver.examconfig.props.label.permittedProcesses.strongKill.tooltip=Terminate process in a not-nice way, which may cause data loss if the application had unsaved data
 
+sebserver.examconfig.props.label.prohibitedProcesses.add.tooltip=Add prohibited process
+sebserver.examconfig.props.label.prohibitedProcesses.remove.tooltip=Remove selected prohibited process
 sebserver.examconfig.props.label.prohibitedProcesses.row.title=Prohibited Processes
 sebserver.examconfig.props.label.prohibitedProcesses=Prohibited Processes
 sebserver.examconfig.props.label.prohibitedProcesses.active=Active
@@ -746,7 +749,7 @@ sebserver.examconfig.props.label.prohibitedProcesses.identifier.tooltip=Title of
 sebserver.examconfig.props.label.prohibitedProcesses.strongKill=Force quit (risk of data loss)
 sebserver.examconfig.props.label.prohibitedProcesses.strongKill.tooltip=Terminate process in a not-nice way, which may cause data loss if the application had unsaved data
 
-sebserver.examconfig.props.group.urlFilter=Fitler
+sebserver.examconfig.props.group.urlFilter=Filter
 sebserver.examconfig.props.label.URLFilterEnable=Activate URL Filtering
 sebserver.examconfig.props.label.URLFilterEnableContentFilter=Filter also embedded content
 sebserver.examconfig.props.label.URLFilterRules=Filter
@@ -757,6 +760,8 @@ sebserver.examconfig.props.label.URLFilterRules.expression=Expression
 sebserver.examconfig.props.label.URLFilterRules.action=Action
 sebserver.examconfig.props.label.URLFilterRules.action.0=Block
 sebserver.examconfig.props.label.URLFilterRules.action.1=Allow
+sebserver.examconfig.props.label.URLFilterRules.add.tooltip=Add new URL Filter
+sebserver.examconfig.props.label.URLFilterRules.remove.tooltip=Remove selected URL Filter
 
 sebserver.examconfig.props.group.proxies=Proxies
 sebserver.examconfig.props.label.proxySettingsPolicy=proxy settings policy
@@ -1121,4 +1126,3 @@ sebserver.seblogs.form.column.exam.description=Description
 sebserver.seblogs.form.column.exam.type=Type
 sebserver.seblogs.form.column.exam.startTime=Start Time
 sebserver.seblogs.form.column.exam.endTime=End Time
-