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

Merge pull request #341 from andreasb242/master

Browse Source 
fixed #249 Paper format 16x9 and 4x3
presentation
andreasb242 7 years ago committed by GitHub
parent 9172ca437d 3310ccbe6a
commit 66982180aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 115 additions and 102 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/settings/Settings.cpp
  2. 7
      src/control/settings/Settings.h
  3. 189
      src/gui/dialog/FormatDialog.cpp
  4. 4
      src/gui/dialog/FormatDialog.h

17
src/control/settings/Settings.cpp
Unescape View File

@ -85,9 +85,6 @@ void Settings::loadDefault()
this->defaultSaveName = _("%F-Note-%H-%M.xoj");
this->visiblePageFormats = GTK_PAPER_NAME_A4 "," GTK_PAPER_NAME_A5 ","
GTK_PAPER_NAME_LETTER "," GTK_PAPER_NAME_LEGAL;
// Eraser
this->buttonConfig[0] = new ButtonConfig(TOOL_ERASER, 0, TOOL_SIZE_NONE, DRAWING_TYPE_NONE, ERASER_TYPE_NONE);
// Middle button
@ -339,10 +336,6 @@ void Settings::parseItem(xmlDocPtr doc, xmlNodePtr cur)
{
this->defaultSaveName = (const char*) value;
}
else if (xmlStrcmp(name, (const xmlChar*) "visiblePageFormats") == 0)
{
this->visiblePageFormats = (const char*) value;
}
else if (xmlStrcmp(name, (const xmlChar*) "pageTemplate") == 0)
{
this->pageTemplate = (const char*) value;
@ -829,9 +822,6 @@ void Settings::save()
WRITE_STRING_PROP(defaultSaveName);
WRITE_STRING_PROP(visiblePageFormats);
WRITE_COMMENT("This paper format is visible in the paper format dialog, separated by a colon");
WRITE_BOOL_PROP(autosaveEnabled);
WRITE_INT_PROP(autosaveTimeout);
@ -1177,13 +1167,6 @@ void Settings::setDefaultSaveName(string name)
save();
}
string Settings::getVisiblePageFormats()
{
XOJ_CHECK_TYPE(Settings);
return this->visiblePageFormats;
}
bool Settings::isEventCompression()
{
XOJ_CHECK_TYPE(Settings);

7
src/control/settings/Settings.h
Unescape View File

@ -259,8 +259,6 @@ public:
int getPdfPageCacheSize();
void setPdfPageCacheSize(int size);
string getVisiblePageFormats();
bool isEventCompression();
void setEventCompression(bool enabled);
@ -490,11 +488,6 @@ private:
*/
int selectionColor;
/**
* The page format which are visible
*/
string visiblePageFormats;
/**
* Whether event compression should be enabled
*/

189
src/gui/dialog/FormatDialog.cpp
Unescape View File

@ -5,8 +5,12 @@
#include <config.h>
#include <i18n.h>
#include <boost/algorithm/string/predicate.hpp>
FormatDialog::FormatDialog(GladeSearchpath* gladeSearchPath, Settings* settings, double width, double height)
: GladeGui(gladeSearchPath, "pagesize.glade", "pagesizeDialog")
: GladeGui(gladeSearchPath, "pagesize.glade", "pagesizeDialog"),
list(NULL),
ignoreSpinChange(false)
{
XOJ_INIT_TYPE(FormatDialog);
@ -22,8 +26,7 @@ FormatDialog::FormatDialog(GladeSearchpath* gladeSearchPath, Settings* settings,
this->width = -1;
this->height = -1;
gtk_spin_button_set_value(GTK_SPIN_BUTTON(get("spinWidth")), this->origWidth / this->scale);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(get("spinHeight")), this->origHeight / this->scale);
setSpinValues(this->origWidth / this->scale, this->origHeight / this->scale);
GtkWidget* cbUnit = get("cbUnit");
@ -44,8 +47,6 @@ FormatDialog::FormatDialog(GladeSearchpath* gladeSearchPath, Settings* settings,
int selectedFormat = -1;
string formatlist = settings->getVisiblePageFormats();
if (height < width)
{
double tmp = width;
@ -53,44 +54,24 @@ FormatDialog::FormatDialog(GladeSearchpath* gladeSearchPath, Settings* settings,
height = tmp;
}
this->list = gtk_paper_size_get_paper_sizes(false);
loadPageFormats();
int i = 0;
GList* next = NULL;
for (GList* l = list; l != NULL; l = next)
for (GList* l = list; l != NULL; l = l->next)
{
GtkPaperSize* s = (GtkPaperSize*) l->data;
next = l->next;
double w = gtk_paper_size_get_width(s, GTK_UNIT_POINTS);
double h = gtk_paper_size_get_height(s, GTK_UNIT_POINTS);
bool visible = false;
if (((int) (w - width) * 10) == 0 && ((int) (h - height) * 10) == 0)
{
selectedFormat = i;
visible = true;
}
if (formatlist.find(gtk_paper_size_get_name(s)) != string::npos)
string displayName = gtk_paper_size_get_display_name(s);
if (boost::starts_with(displayName, "custom_"))
{
visible = true;
displayName = displayName.substr(7);
}
if (visible)
{
GtkTreeIter iter;
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter, 0, gtk_paper_size_get_display_name(s), -1);
gtk_list_store_set(store, &iter, 1, s, -1);
i++;
}
else
{
gtk_paper_size_free(s);
this->list = g_list_delete_link(this->list, l);
}
GtkTreeIter iter;
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter, 0, displayName.c_str(), -1);
gtk_list_store_set(store, &iter, 1, s, -1);
i++;
}
GtkTreeIter iter;
@ -123,11 +104,8 @@ FormatDialog::~FormatDialog()
for (GList* l = this->list; l != NULL; l = l->next)
{
if (l->data)
{
GtkPaperSize* s = (GtkPaperSize*) l->data;
gtk_paper_size_free(s);
}
GtkPaperSize* s = (GtkPaperSize*) l->data;
gtk_paper_size_free(s);
}
g_list_free(this->list);
@ -136,6 +114,40 @@ FormatDialog::~FormatDialog()
XOJ_RELEASE_TYPE(FormatDialog);
}
#define ADD_FORMAT(format) this->list = g_list_append(this->list, gtk_paper_size_new(format))
void FormatDialog::loadPageFormats()
{
XOJ_CHECK_TYPE(FormatDialog);
this->list = gtk_paper_size_get_paper_sizes(false);
GList* next = NULL;
for (GList* l = list; l != NULL; l = next)
{
// Copy next here, because the entry may be deleted
next = l->next;
GtkPaperSize* s = (GtkPaperSize*) l->data;
string name = gtk_paper_size_get_name(s);
if (name == GTK_PAPER_NAME_A3 ||
name == GTK_PAPER_NAME_A4 ||
name == GTK_PAPER_NAME_A5 ||
name == GTK_PAPER_NAME_LETTER ||
name == GTK_PAPER_NAME_LEGAL)
{
continue;
}
gtk_paper_size_free(s);
this->list = g_list_delete_link(this->list, l);
}
// Name format: ftp://ftp.pwg.org/pub/pwg/candidates/cs-pwgmsn10-20020226-5101.1.pdf
ADD_FORMAT("custom_16x9_320x180mm");
ADD_FORMAT("custom_4x3_320x240mm");
}
double FormatDialog::getWidth()
{
XOJ_CHECK_TYPE(FormatDialog);
@ -171,6 +183,11 @@ void FormatDialog::spinValueChangedCb(GtkSpinButton* spinbutton, FormatDialog* d
{
XOJ_CHECK_TYPE_OBJ(dlg, FormatDialog);
if (dlg->ignoreSpinChange)
{
return;
}
double width = gtk_spin_button_get_value(GTK_SPIN_BUTTON(dlg->get("spinWidth"))) * dlg->scale;
double height = gtk_spin_button_get_value(GTK_SPIN_BUTTON(dlg->get("spinHeight"))) * dlg->scale;
@ -224,8 +241,7 @@ void FormatDialog::cbUnitChanged(GtkComboBox* widget, FormatDialog* dlg)
dlg->selectedScale = selectd;
dlg->scale = XOJ_UNITS[dlg->selectedScale].scale;
gtk_spin_button_set_value(GTK_SPIN_BUTTON(dlg->get("spinWidth")), width / dlg->scale);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(dlg->get("spinHeight")), height / dlg->scale);
dlg->setSpinValues(width / dlg->scale, height / dlg->scale);
}
void FormatDialog::cbFormatChangedCb(GtkComboBox* widget, FormatDialog* dlg)
@ -234,40 +250,51 @@ void FormatDialog::cbFormatChangedCb(GtkComboBox* widget, FormatDialog* dlg)
GtkTreeIter iter;
if (gtk_combo_box_get_active_iter(widget, &iter))
if (!gtk_combo_box_get_active_iter(widget, &iter))
{
return;
}
GtkTreeModel* model = gtk_combo_box_get_model(widget);
GValue value = { 0 };
gtk_tree_model_get_value(model, &iter, 1, &value);
if (!G_VALUE_HOLDS_POINTER(&value))
{
return;
}
GtkPaperSize* s = (GtkPaperSize*) g_value_get_pointer(&value);
if (s == NULL)
{
GtkTreeModel* model = gtk_combo_box_get_model(widget);
return;
}
GValue value = { 0 };
gtk_tree_model_get_value(model, &iter, 1, &value);
double width = gtk_paper_size_get_width(s, GTK_UNIT_POINTS) / dlg->scale;
double height = gtk_paper_size_get_height(s, GTK_UNIT_POINTS) / dlg->scale;
if (G_VALUE_HOLDS_POINTER(&value))
if (dlg->orientation == ORIENTATION_LANDSCAPE)
{
if (width < height)
{
double tmp = width;
width = height;
height = tmp;
}
}
else
{
if (width > height)
{
GtkPaperSize* s = (GtkPaperSize*) g_value_get_pointer(&value);
if (s == NULL)
{
return;
}
double width = gtk_paper_size_get_width(s, GTK_UNIT_POINTS) / dlg->scale;
double height = gtk_paper_size_get_height(s, GTK_UNIT_POINTS) / dlg->scale;
if (dlg->orientation == ORIENTATION_LANDSCAPE)
{
double tmp = width;
width = height;
height = tmp;
}
else
{
dlg->setOrientation(ORIENTATION_PORTRAIT);
}
gtk_spin_button_set_value(GTK_SPIN_BUTTON(dlg->get("spinWidth")), width);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(dlg->get("spinHeight")), height);
double tmp = width;
width = height;
height = tmp;
}
dlg->setOrientation(ORIENTATION_PORTRAIT);
}
dlg->setSpinValues(width, height);
}
void FormatDialog::portraitSelectedCb(GtkToggleToolButton* bt, FormatDialog* dlg)
@ -286,8 +313,8 @@ void FormatDialog::portraitSelectedCb(GtkToggleToolButton* bt, FormatDialog* dlg
if (width > height)
{
gtk_spin_button_set_value(GTK_SPIN_BUTTON(dlg->get("spinWidth")), height);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(dlg->get("spinHeight")), width);
// Exchange width and height
dlg->setSpinValues(height, width);
}
}
}
@ -308,12 +335,20 @@ void FormatDialog::landscapeSelectedCb(GtkToggleToolButton* bt, FormatDialog* dl
if (width < height)
{
gtk_spin_button_set_value(GTK_SPIN_BUTTON(dlg->get("spinWidth")), height);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(dlg->get("spinHeight")), width);
// Exchange width and height
dlg->setSpinValues(height, width);
}
}
}
void FormatDialog::setSpinValues(double width, double heigth)
{
ignoreSpinChange = true;
gtk_spin_button_set_value(GTK_SPIN_BUTTON(get("spinWidth")), width);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(get("spinHeight")), heigth);
ignoreSpinChange = false;
}
void FormatDialog::show(GtkWindow* parent)
{
XOJ_CHECK_TYPE(FormatDialog);
@ -321,13 +356,11 @@ void FormatDialog::show(GtkWindow* parent)
int ret = 0;
while (ret == 0)
{
gtk_window_set_transient_for(GTK_WINDOW(this->window), parent);
ret = gtk_dialog_run(GTK_DIALOG(this->window));
if (ret == 0)
{
gtk_spin_button_set_value(GTK_SPIN_BUTTON(get("spinWidth")), this->origWidth / this->scale);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(get("spinHeight")), this->origHeight / this->scale);
setSpinValues(this->origWidth / this->scale, this->origHeight / this->scale);
}
}

4
src/gui/dialog/FormatDialog.h
Unescape View File

@ -34,7 +34,9 @@ public:
double getHeight();
private:
void loadPageFormats();
void setOrientation(Orientation portrait);
void setSpinValues(double width, double heigth);
static void portraitSelectedCb(GtkToggleToolButton* toggle_tool_button, FormatDialog* dlg);
static void landscapeSelectedCb(GtkToggleToolButton* toggle_tool_button, FormatDialog* dlg);
@ -59,4 +61,6 @@ private:
double width;
double height;
double ignoreSpinChange;
};

Write Preview
Loading…
Cancel
Save