rework page info

remove old dialog fix l10n set titles add tooltips
JabRef · Nov 11, 2018 · 93ac650 · 93ac650
1 parent 7746782
commit 93ac650
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 278 deletions.
diff --git a/src/main/java/org/jabref/gui/openoffice/CitationManager.java b/src/main/java/org/jabref/gui/openoffice/CitationManager.java
diff --git a/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialog.fxml b/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialog.fxml
@@ -14,7 +14,7 @@
       <TableView fx:id="tvCitations" prefHeight="208.0" prefWidth="662.0">
         <columns>
           <TableColumn fx:id="colCitation" prefWidth="251.0" text="%Citation" />
-          <TableColumn fx:id="colExtraInfo" prefWidth="425.0" text="%Extra information" />
+          <TableColumn fx:id="colExtraInfo" prefWidth="425.0" text="%Extra information (e.g. page number)"/>
         </columns>
       </TableView>
    </content>

diff --git a/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java b/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java
@@ -10,6 +10,7 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.ValueTableCellFactory;
+import org.jabref.logic.l10n.Localization;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import com.sun.star.beans.UnknownPropertyException;
@@ -41,6 +42,8 @@ public ManageCitationsDialogView(OOBibBase ooBase, DialogService dialogService)
             }
             return null;
         });
+
+        setTitle(Localization.lang("Manage citations"));
     }
 
     @FXML
@@ -63,7 +66,6 @@ private void initialize() throws NoSuchElementException, WrappedTargetException,
             cell.getRowValue().setExtraInfo(cell.getNewValue());
         });
         colExtraInfo.setCellFactory(TextFieldTableCell.forTableColumn());
-
     }
 
 }
diff --git a/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogViewModel.java b/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogViewModel.java
@@ -55,14 +55,17 @@ public ManageCitationsDialogViewModel(OOBibBase ooBase, DialogService dialogServ
             ManageCitationsItemViewModel itemViewModelEntry = ManageCitationsItemViewModel.fromCitationEntry(entry);
             citations.add(itemViewModelEntry);
         }
+
     }
 
+    //TODO: Call store settings after edit commit
+    //update reference then and call refresh/sync in the background
     public void storeSettings() {
         List<CitationEntry> ciationEntries = citations.stream().map(ManageCitationsItemViewModel::toCitationEntry).collect(Collectors.toList());
         try {
             for (CitationEntry entry : ciationEntries) {
                 Optional<String> pageInfo = entry.getPageInfo();
-                if (entry.pageInfoChanged() && pageInfo.isPresent()) {
+                if (pageInfo.isPresent()) {
                     ooBase.setCustomProperty(entry.getRefMarkName(), pageInfo.get());
                 }
             }

diff --git a/src/main/java/org/jabref/gui/openoffice/ManualConnectDialogView.java b/src/main/java/org/jabref/gui/openoffice/ManualConnectDialogView.java
@@ -11,6 +11,7 @@
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.util.BaseDialog;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.openoffice.OpenOfficePreferences;
 import org.jabref.logic.util.OS;
 import org.jabref.preferences.PreferencesService;
@@ -57,8 +58,8 @@ public ManualConnectDialogView(DialogService dialogService) {
             return null;
         });
 
+        setTitle(Localization.lang("Set connection parameters"));
     }
-
     @FXML
     private void initialize() {
         this.preferences = preferencesService.getOpenOfficePreferences();

diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.fxml b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.fxml
@@ -14,15 +14,15 @@
          <top>
             <TableView fx:id="tvStyles" prefHeight="208.0" prefWidth="662.0" BorderPane.alignment="CENTER">
               <columns>
-                <TableColumn fx:id="colName" prefWidth="75.0" text="%Name" />
-                <TableColumn fx:id="colJournals" prefWidth="75.0" text="%Jorurnals" />
+                <TableColumn fx:id="colName" prefWidth="75.0" text="%Name"/>
+                <TableColumn fx:id="colJournals" prefWidth="75.0" text="%Journals" />
                   <TableColumn fx:id="colFile" prefWidth="75.0" text="%File" />
                   <TableColumn fx:id="colDeleteIcon" minWidth="60.0" prefWidth="60.0" />
               </columns>
             </TableView>
          </top>
          <right>
-            <Button fx:id="add" alignment="TOP_RIGHT" mnemonicParsing="false" onAction="#addStyleFile" text="%add" BorderPane.alignment="CENTER" />
+            <Button fx:id="add" alignment="TOP_RIGHT" mnemonicParsing="false" onAction="#addStyleFile" text="%Add style file" BorderPane.alignment="CENTER" />
          </right>
          <bottom>
             <VBox fx:id="vbox" prefHeight="84.0" prefWidth="665.0" BorderPane.alignment="CENTER" />

diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
@@ -64,6 +64,7 @@ public StyleSelectDialogView(DialogService dialogService, StyleLoader loader) {
             return null;
 
         });
+        setTitle(Localization.lang("Style selection"));
     }
 
     @FXML
@@ -89,6 +90,8 @@ private void initialize() {
 
         }).withOnMouseClickedEvent(item -> {
             return evt -> viewModel.deleteStyle();
+        }).withTooltip(item -> {
+            return Localization.lang("Remove style");
         }).install(colDeleteIcon);
 
         edit.setOnAction(e -> viewModel.editStyle());

diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogViewModel.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogViewModel.java
@@ -77,7 +77,7 @@ public void addStyleFile() {
                 preferences.setCurrentStyle(stylePath);
                 styles.setAll(loadStyles());
             } else {
-                dialogService.showErrorDialogAndWait(Localization.lang("Invalid style selected"));
+                dialogService.showErrorDialogAndWait(Localization.lang("Invalid style selected"), Localization.lang("You must select a valid style file."));
             }
         });