wilderjds
/
xournalpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Row or Column size now part of same radio group. Layout properly reflects users choice.

Browse Source
presentation
JJones780 7 years ago
parent feb6227bea
commit 2679cde606
4 changed files with 200 additions and 187 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      src/control/Control.cpp
  2. 4
      src/enums/ActionGroup.enum.h
  3. 18
      src/enums/generated/ActionGroup.generated.cpp
  4. 348
      ui/main.glade

17
src/control/Control.cpp
Unescape View File

@ -345,9 +345,13 @@ void Control::initWindow(MainWindow* win)
// Disable undo buttons
undoRedoChanged();
setViewColumns(settings->getViewColumns());
setViewRows(settings->getViewRows());
if( settings->isViewFixedRows()){
setViewRows(settings->getViewRows());
}
else
{
setViewColumns(settings->getViewColumns());
}
setViewLayoutVert(settings->getViewLayoutVert());
setViewLayoutR2L(settings->getViewLayoutR2L());
@ -1572,6 +1576,7 @@ void Control::setViewColumns(int numColumns)
XOJ_CHECK_TYPE(Control);
settings->setViewColumns(numColumns);
settings->setViewFixedRows(false);
ActionType action;
@ -1587,7 +1592,7 @@ void Control::setViewColumns(int numColumns)
default: action = ACTION_SET_COLUMNS;
}
fireActionSelected(GROUP_COLUMNS, action);
fireActionSelected(GROUP_FIXED_ROW_OR_COLS, action);
int currentPage = getCurrentPageNo();
win->getXournal()->layoutPages();
@ -1599,6 +1604,8 @@ void Control::setViewRows(int numRows)
XOJ_CHECK_TYPE(Control);
settings->setViewRows(numRows);
settings->setViewFixedRows(true);
ActionType action;
@ -1614,7 +1621,7 @@ void Control::setViewRows(int numRows)
default: action = ACTION_SET_ROWS;
}
fireActionSelected(GROUP_ROWS, action);
fireActionSelected(GROUP_FIXED_ROW_OR_COLS, action);
int currentPage = getCurrentPageNo();
win->getXournal()->layoutPages();

4
src/enums/ActionGroup.enum.h
Unescape View File

@ -58,9 +58,7 @@ enum ActionGroup
GROUP_FILL,
GROUP_COLUMNS,
GROUP_ROWS,
GROUP_FIXED_ROW_OR_COLS,
GROUP_LAYOUT_HORIZONTAL,

18
src/enums/generated/ActionGroup.generated.cpp
Unescape View File

@ -117,14 +117,9 @@ ActionGroup ActionGroup_fromString(string value)
return GROUP_FILL;
}
if (value == "GROUP_COLUMNS")
if (value == "GROUP_FIXED_ROW_OR_COLS")
{
return GROUP_COLUMNS;
}
if (value == "GROUP_ROWS")
{
return GROUP_ROWS;
return GROUP_FIXED_ROW_OR_COLS;
}
if (value == "GROUP_LAYOUT_HORIZONTAL")
@ -250,14 +245,9 @@ string ActionGroup_toString(ActionGroup value)
return "GROUP_FILL";
}
if (value == GROUP_COLUMNS)
{
return "GROUP_COLUMNS";
}
if (value == GROUP_ROWS)
if (value == GROUP_FIXED_ROW_OR_COLS)
{
return "GROUP_ROWS";
return "GROUP_FIXED_ROW_OR_COLS";
}
if (value == GROUP_LAYOUT_HORIZONTAL)

348
ui/main.glade
Unescape View File

@ -441,193 +441,211 @@
</object>
</child>
<child>
<object class="GtkMenuItem" id="menuitemViewColumns">
<object class="GtkMenuItem" id="menuitemViewDimensions">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Columns</property>
<property name="label" translatable="yes">_Cols/Rows</property>
<property name="use_underline">True</property>
<child type="submenu">
<object class="GtkMenu" id="menuViewColumns">
<object class="GtkMenu" id="menuViewDimensions">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkCheckMenuItem" id="menuViewColumns1">
<object class="GtkMenuItem" id="menuitemViewColumns">
<property name="width_request">-1</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_1</property>
<property name="label" translatable="yes">set Cols</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_SET_COLUMNS_1:GROUP_COLUMNS" swapped="no"/>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="menuViewColumns2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_2</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_SET_COLUMNS_2:GROUP_COLUMNS" swapped="no"/>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="menuViewColumns3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_3</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_SET_COLUMNS_3:GROUP_COLUMNS" swapped="no"/>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="menuViewColumns4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_4</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_SET_COLUMNS_4:GROUP_COLUMNS" swapped="no"/>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="menuViewColumns5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_5</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_SET_COLUMNS_5:GROUP_COLUMNS" swapped="no"/>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="menuViewColumns6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">6</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_SET_COLUMNS_6:GROUP_COLUMNS" swapped="no"/>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="menuViewColumns7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">7</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_SET_COLUMNS_7:GROUP_COLUMNS" swapped="no"/>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="menuViewColumns8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">8</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_SET_COLUMNS_8:GROUP_COLUMNS" swapped="no"/>
</object>
</child>
</object>
</child>
</object>
</child>
<child>
<object class="GtkMenuItem" id="menuitemViewRows">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Rows</property>
<property name="use_underline">True</property>
<child type="submenu">
<object class="GtkMenu" id="menuViewRows">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkCheckMenuItem" id="menuViewRows1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_1</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_SET_ROWS_1:GROUP_ROWS" swapped="no"/>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="menuViewRows2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_2</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_SET_ROWS_2:GROUP_ROWS" swapped="no"/>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="menuViewRows3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_3</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_SET_ROWS_3:GROUP_ROWS" swapped="no"/>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="menuViewRows4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_4</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_SET_ROWS_4:GROUP_ROWS" swapped="no"/>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="menuViewRows5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_5</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_SET_ROWS_5:GROUP_ROWS" swapped="no"/>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="menuViewRows6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">6</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_SET_ROWS_6:GROUP_ROWS" swapped="no"/>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="menuViewRows7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">7</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_SET_ROWS_7:GROUP_ROWS" swapped="no"/>
<child type="submenu">
<object class="GtkMenu" id="menuViewColumns">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkCheckMenuItem" id="menuViewColumns1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_1</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_SET_COLUMNS_1:GROUP_FIXED_ROW_OR_COLS" swapped="no"/>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="menuViewColumns2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_2</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_SET_COLUMNS_2:GROUP_FIXED_ROW_OR_COLS" swapped="no"/>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="menuViewColumns3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_3</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_SET_COLUMNS_3:GROUP_FIXED_ROW_OR_COLS" swapped="no"/>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="menuViewColumns4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_4</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_SET_COLUMNS_4:GROUP_FIXED_ROW_OR_COLS" swapped="no"/>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="menuViewColumns5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_5</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_SET_COLUMNS_5:GROUP_FIXED_ROW_OR_COLS" swapped="no"/>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="menuViewColumns6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">6</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_SET_COLUMNS_6:GROUP_FIXED_ROW_OR_COLS" swapped="no"/>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="menuViewColumns7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">7</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_SET_COLUMNS_7:GROUP_FIXED_ROW_OR_COLS" swapped="no"/>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="menuViewColumns8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">8</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_SET_COLUMNS_8:GROUP_FIXED_ROW_OR_COLS" swapped="no"/>
</object>
</child>
</object>
</child>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="menuViewRows8">
<object class="GtkMenuItem" id="menuitemViewRows">
<property name="width_request">-1</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">8</property>
<property name="label" translatable="yes">set Rows</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_SET_ROWS_8:GROUP_ROWS" swapped="no"/>
<child type="submenu">
<object class="GtkMenu" id="menuViewRows">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkCheckMenuItem" id="menuViewRows1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_1</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_SET_ROWS_1:GROUP_FIXED_ROW_OR_COLS" swapped="no"/>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="menuViewRows2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_2</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_SET_ROWS_2:GROUP_FIXED_ROW_OR_COLS" swapped="no"/>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="menuViewRows3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_3</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_SET_ROWS_3:GROUP_FIXED_ROW_OR_COLS" swapped="no"/>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="menuViewRows4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_4</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_SET_ROWS_4:GROUP_FIXED_ROW_OR_COLS" swapped="no"/>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="menuViewRows5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_5</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_SET_ROWS_5:GROUP_FIXED_ROW_OR_COLS" swapped="no"/>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="menuViewRows6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">6</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_SET_ROWS_6:GROUP_FIXED_ROW_OR_COLS" swapped="no"/>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="menuViewRows7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">7</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_SET_ROWS_7:GROUP_FIXED_ROW_OR_COLS" swapped="no"/>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="menuViewRows8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">8</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_SET_ROWS_8:GROUP_FIXED_ROW_OR_COLS" swapped="no"/>
</object>
</child>
</object>
</child>
</object>
</child>
</object>
</child>
</object>
</child>
<child>
<object class="GtkSeparatorMenuItem" id="separatormenuitem7">
<property name="visible">True</property>

Write Preview
Loading…
Cancel
Save