X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2FTTableWindow.java;h=984e660fe51e8738a1c344576b485ab83ffc02ba;hb=589c6ce94839d9b4c6144a24cabad8031596c83b;hp=507dde72df8e923150e89ce7214d136658e21e68;hpb=9c1720164b004d462af8284c21fb2666e2affd63;p=fanfix.git diff --git a/src/jexer/TTableWindow.java b/src/jexer/TTableWindow.java index 507dde7..984e660 100644 --- a/src/jexer/TTableWindow.java +++ b/src/jexer/TTableWindow.java @@ -28,6 +28,8 @@ */ package jexer; +import java.io.IOException; +import java.text.MessageFormat; import java.util.ResourceBundle; import jexer.event.TCommandEvent; @@ -73,7 +75,7 @@ public class TTableWindow extends TScrollableWindow { super(parent, title, 0, 0, parent.getScreen().getWidth() / 2, parent.getScreen().getHeight() / 2 - 2, RESIZABLE | CENTERED); - tableField = new TTableWidget(this, 0, 0, getWidth() - 2, getHeight() - 2); + tableField = addTable(0, 0, getWidth() - 2, getHeight() - 2); setupAfterTable(); } @@ -88,8 +90,14 @@ public class TTableWindow extends TScrollableWindow { public void onFocus() { // Enable the table menu items. getApplication().enableMenuItem(TMenu.MID_CUT); + getApplication().enableMenuItem(TMenu.MID_TABLE_VIEW_ROW_LABELS); + getApplication().enableMenuItem(TMenu.MID_TABLE_VIEW_COLUMN_LABELS); + getApplication().enableMenuItem(TMenu.MID_TABLE_VIEW_HIGHLIGHT_ROW); + getApplication().enableMenuItem(TMenu.MID_TABLE_VIEW_HIGHLIGHT_COLUMN); getApplication().enableMenuItem(TMenu.MID_TABLE_BORDER_NONE); getApplication().enableMenuItem(TMenu.MID_TABLE_BORDER_ALL); + getApplication().enableMenuItem(TMenu.MID_TABLE_BORDER_CELL_NONE); + getApplication().enableMenuItem(TMenu.MID_TABLE_BORDER_CELL_ALL); getApplication().enableMenuItem(TMenu.MID_TABLE_BORDER_RIGHT); getApplication().enableMenuItem(TMenu.MID_TABLE_BORDER_LEFT); getApplication().enableMenuItem(TMenu.MID_TABLE_BORDER_TOP); @@ -117,8 +125,14 @@ public class TTableWindow extends TScrollableWindow { public void onUnfocus() { // Disable the table menu items. getApplication().disableMenuItem(TMenu.MID_CUT); + getApplication().disableMenuItem(TMenu.MID_TABLE_VIEW_ROW_LABELS); + getApplication().disableMenuItem(TMenu.MID_TABLE_VIEW_COLUMN_LABELS); + getApplication().disableMenuItem(TMenu.MID_TABLE_VIEW_HIGHLIGHT_ROW); + getApplication().disableMenuItem(TMenu.MID_TABLE_VIEW_HIGHLIGHT_COLUMN); getApplication().disableMenuItem(TMenu.MID_TABLE_BORDER_NONE); getApplication().disableMenuItem(TMenu.MID_TABLE_BORDER_ALL); + getApplication().disableMenuItem(TMenu.MID_TABLE_BORDER_CELL_NONE); + getApplication().disableMenuItem(TMenu.MID_TABLE_BORDER_CELL_ALL); getApplication().disableMenuItem(TMenu.MID_TABLE_BORDER_RIGHT); getApplication().disableMenuItem(TMenu.MID_TABLE_BORDER_LEFT); getApplication().disableMenuItem(TMenu.MID_TABLE_BORDER_TOP); @@ -143,18 +157,6 @@ public class TTableWindow extends TScrollableWindow { // TWindow ---------------------------------------------------------------- // ------------------------------------------------------------------------ - /** - * Draw the window. - */ - @Override - public void draw() { - // Draw as normal. - super.draw(); - - // Add borders on rows and columns. - // TODO - } - /** * Handle mouse press events. * @@ -167,19 +169,10 @@ public class TTableWindow extends TScrollableWindow { if (mouseOnTable(mouse)) { // The table might have changed, update the scollbars. - // TODO - /* - setBottomValue(editField.getMaximumRowNumber()); - setVerticalValue(editField.getVisibleRowNumber()); - setRightValue(editField.getMaximumColumnNumber()); - setHorizontalValue(editField.getEditingColumnNumber()); - */ - } else { - if (mouse.isMouseWheelUp() || mouse.isMouseWheelDown()) { - // Vertical scrollbar actions - // TODO - // editField.setVisibleRowNumber(getVerticalValue()); - } + setBottomValue(tableField.getRowCount() - 1); + setVerticalValue(tableField.getSelectedRowNumber()); + setRightValue(tableField.getColumnCount() - 1); + setHorizontalValue(tableField.getSelectedColumnNumber()); } } @@ -194,12 +187,13 @@ public class TTableWindow extends TScrollableWindow { super.onMouseUp(mouse); if (mouse.isMouse1() && mouseOnVerticalScroller(mouse)) { - // Clicked on vertical scrollbar - // TODO - // editField.setVisibleRowNumber(getVerticalValue()); + // Clicked/dragged on vertical scrollbar. + tableField.setSelectedRowNumber(getVerticalValue()); + } + if (mouse.isMouse1() && mouseOnHorizontalScroller(mouse)) { + // Clicked/dragged on horizontal scrollbar. + tableField.setSelectedColumnNumber(getHorizontalValue()); } - - // TODO: horizontal scrolling } /** @@ -213,22 +207,20 @@ public class TTableWindow extends TScrollableWindow { super.onMouseMotion(mouse); if (mouseOnTable(mouse) && mouse.isMouse1()) { - // The editor might have changed, update the scollbars. - // TODO - /* - setBottomValue(editField.getMaximumRowNumber()); - setVerticalValue(editField.getVisibleRowNumber()); - setRightValue(editField.getMaximumColumnNumber()); - setHorizontalValue(editField.getEditingColumnNumber()); - */ + // The table might have changed, update the scollbars. + setBottomValue(tableField.getRowCount() - 1); + setVerticalValue(tableField.getSelectedRowNumber()); + setRightValue(tableField.getColumnCount() - 1); + setHorizontalValue(tableField.getSelectedColumnNumber()); } else { if (mouse.isMouse1() && mouseOnVerticalScroller(mouse)) { - // Clicked/dragged on vertical scrollbar - // TODO - // editField.setVisibleRowNumber(getVerticalValue()); + // Clicked/dragged on vertical scrollbar. + tableField.setSelectedRowNumber(getVerticalValue()); + } + if (mouse.isMouse1() && mouseOnHorizontalScroller(mouse)) { + // Clicked/dragged on horizontal scrollbar. + tableField.setSelectedColumnNumber(getHorizontalValue()); } - - // TODO: horizontal scrolling } } @@ -243,14 +235,11 @@ public class TTableWindow extends TScrollableWindow { // Use TWidget's code to pass the event to the children. super.onKeypress(keypress); - // The editor might have changed, update the scollbars. - // TODO - /* - setBottomValue(editField.getMaximumRowNumber()); - setVerticalValue(editField.getVisibleRowNumber()); - setRightValue(editField.getMaximumColumnNumber()); - setHorizontalValue(editField.getEditingColumnNumber()); - */ + // The table might have changed, update the scollbars. + setBottomValue(tableField.getRowCount() - 1); + setVerticalValue(tableField.getSelectedRowNumber()); + setRightValue(tableField.getColumnCount() - 1); + setHorizontalValue(tableField.getSelectedColumnNumber()); } /** @@ -277,6 +266,54 @@ public class TTableWindow extends TScrollableWindow { } } + /** + * Method that subclasses can override to handle posted command events. + * + * @param command command event + */ + @Override + public void onCommand(final TCommandEvent command) { + if (command.equals(cmOpen)) { + try { + String filename = fileOpenBox("."); + if (filename != null) { + try { + // TODO + if (false) { + tableField.saveToFilename(filename); + } + } catch (IOException e) { + messageBox(i18n.getString("errorDialogTitle"), + MessageFormat.format(i18n. + getString("errorReadingFile"), e.getMessage())); + } + } + } catch (IOException e) { + messageBox(i18n.getString("errorDialogTitle"), + MessageFormat.format(i18n. + getString("errorOpeningFileDialog"), e.getMessage())); + } + return; + } + + if (command.equals(cmSave)) { + try { + String filename = fileSaveBox("."); + if (filename != null) { + tableField.saveToFilename(filename); + } + } catch (IOException e) { + messageBox(i18n.getString("errorDialogTitle"), + MessageFormat.format(i18n. + getString("errorSavingFile"), e.getMessage())); + } + return; + } + + // Didn't handle it, let children get it instead + super.onCommand(command); + } + // ------------------------------------------------------------------------ // TTableWindow ----------------------------------------------------------- // ------------------------------------------------------------------------ @@ -289,20 +326,19 @@ public class TTableWindow extends TScrollableWindow { vScroller = new TVScroller(this, getWidth() - 2, 0, getHeight() - 2); setMinimumWindowWidth(25); setMinimumWindowHeight(10); - setTopValue(1); - // setBottomValue(editField.getMaximumRowNumber()); - setLeftValue(1); - setRightValue(tableField.getMaximumWidth()); + setTopValue(tableField.getSelectedRowNumber()); + setBottomValue(tableField.getRowCount() - 1); + setLeftValue(tableField.getSelectedColumnNumber()); + setRightValue(tableField.getColumnCount() - 1); statusBar = newStatusBar(i18n.getString("statusBar")); statusBar.addShortcutKeypress(kbF1, cmHelp, i18n.getString("statusBarHelp")); - /* + statusBar.addShortcutKeypress(kbF2, cmSave, i18n.getString("statusBarSave")); statusBar.addShortcutKeypress(kbF3, cmOpen, i18n.getString("statusBarOpen")); - */ statusBar.addShortcutKeypress(kbF10, cmMenu, i18n.getString("statusBarMenu")); }