summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/templates/new-from-template.cpp16
-rw-r--r--src/templates/new-from-template.h4
-rw-r--r--src/templates/static-template-load-tab.cpp30
-rw-r--r--src/templates/static-template-load-tab.h10
-rw-r--r--src/templates/template-load-tab.cpp48
-rw-r--r--src/templates/template-load-tab.h18
6 files changed, 63 insertions, 63 deletions
diff --git a/src/templates/new-from-template.cpp b/src/templates/new-from-template.cpp
index 450337aea..fc590d199 100644
--- a/src/templates/new-from-template.cpp
+++ b/src/templates/new-from-template.cpp
@@ -5,22 +5,22 @@ namespace Inkscape {
namespace UI {
-NewFromTemplate::NewFromTemplate() :
- _createButton("Create from template")
+NewFromTemplate::NewFromTemplate()
+ : _create_template_button("Create from template")
{
set_title("New From Template");
resize(400, 250);
- get_vbox()->pack_start(_mainWidget);
- _mainWidget.append_page(_tab1, "Static Templates");
- _mainWidget.append_page(_tab2, "Procedural Templates");
+ get_vbox()->pack_start(_main_widget);
+ _main_widget.append_page(_tab1, "Static Templates");
+ _main_widget.append_page(_tab2, "Procedural Templates");
Gtk::Alignment *align;
align = manage(new Gtk::Alignment(Gtk::ALIGN_END, Gtk::ALIGN_CENTER, 0.0, 0.0));
get_vbox()->pack_end(*align, Gtk::PACK_SHRINK, 5);
- align->add(_createButton);
+ align->add(_create_template_button);
- _createButton.signal_pressed().connect(
+ _create_template_button.signal_pressed().connect(
sigc::mem_fun(*this, &NewFromTemplate::_createFromTemplate));
show_all();
@@ -29,7 +29,7 @@ NewFromTemplate::NewFromTemplate() :
void NewFromTemplate::_createFromTemplate()
{
- if ( _mainWidget.get_current_page() == 0 ) {
+ if ( _main_widget.get_current_page() == 0 ) {
_tab1.createTemplate();
} else {
_tab2.createTemplate();
diff --git a/src/templates/new-from-template.h b/src/templates/new-from-template.h
index 869680ae3..ef3cbce18 100644
--- a/src/templates/new-from-template.h
+++ b/src/templates/new-from-template.h
@@ -18,8 +18,8 @@ public:
NewFromTemplate();
private:
- Gtk::Notebook _mainWidget;
- Gtk::Button _createButton;
+ Gtk::Notebook _main_widget;
+ Gtk::Button _create_template_button;
StaticTemplateLoadTab _tab1;
TemplateLoadTab _tab2;
diff --git a/src/templates/static-template-load-tab.cpp b/src/templates/static-template-load-tab.cpp
index e71b9dede..83ff32e52 100644
--- a/src/templates/static-template-load-tab.cpp
+++ b/src/templates/static-template-load-tab.cpp
@@ -9,25 +9,25 @@ namespace Inkscape {
namespace UI {
-StaticTemplateLoadTab::StaticTemplateLoadTab() :
- _moreInfoButton("More info"),
- _previewImage("preview.png"),
- _shortDescriptionLabel("Short description - I like trains. ad asda asd asdweqe gdfg"),
- _templateNameLabel("Template_name"),
- _templateAuthorLabel("by template_author")
+StaticTemplateLoadTab::StaticTemplateLoadTab()
+ : _more_info_button("More info")
+ , _preview_image("preview.png")
+ , _short_description_label("Short description - I like trains. ad asda asd asdweqe gdfg")
+ , _template_name_label("Template_name")
+ , _template_author_label("by template_author")
{
- _templateInfoColumn.pack_start(_templateNameLabel, Gtk::PACK_SHRINK, 4);
- _templateInfoColumn.pack_start(_templateAuthorLabel, Gtk::PACK_SHRINK, 0);
- _templateInfoColumn.pack_start(_previewImage, Gtk::PACK_SHRINK, 15);
- _templateInfoColumn.pack_start(_shortDescriptionLabel, Gtk::PACK_SHRINK, 4);
+ _template_info_column.pack_start(_template_name_label, Gtk::PACK_SHRINK, 4);
+ _template_info_column.pack_start(_template_author_label, Gtk::PACK_SHRINK, 0);
+ _template_info_column.pack_start(_preview_image, Gtk::PACK_SHRINK, 15);
+ _template_info_column.pack_start(_short_description_label, Gtk::PACK_SHRINK, 4);
- _shortDescriptionLabel.set_line_wrap(true);
- _shortDescriptionLabel.set_size_request(200);
+ _short_description_label.set_line_wrap(true);
+ _short_description_label.set_size_request(200);
Gtk::Alignment *align;
align = manage(new Gtk::Alignment(Gtk::ALIGN_END, Gtk::ALIGN_CENTER, 0.0, 0.0));
- _templateInfoColumn.pack_start(*align, Gtk::PACK_SHRINK, 5);
- align->add(_moreInfoButton);
+ _template_info_column.pack_start(*align, Gtk::PACK_SHRINK, 5);
+ align->add(_more_info_button);
}
@@ -40,7 +40,7 @@ void StaticTemplateLoadTab::createTemplate()
void StaticTemplateLoadTab::_displayTemplateInfo()
{
TemplateLoadTab::_displayTemplateInfo();
- _templateNameLabel.set_text(_currentTemplate);
+ _template_name_label.set_text(_current_template);
}
}
diff --git a/src/templates/static-template-load-tab.h b/src/templates/static-template-load-tab.h
index e6ed17f4c..651f146a0 100644
--- a/src/templates/static-template-load-tab.h
+++ b/src/templates/static-template-load-tab.h
@@ -20,11 +20,11 @@ public:
protected:
virtual void _displayTemplateInfo();
- Gtk::Button _moreInfoButton;
- Gtk::Label _shortDescriptionLabel;
- Gtk::Label _templateAuthorLabel;
- Gtk::Label _templateNameLabel;
- Gtk::Image _previewImage;
+ Gtk::Button _more_info_button;
+ Gtk::Label _short_description_label;
+ Gtk::Label _template_author_label;
+ Gtk::Label _template_name_label;
+ Gtk::Image _preview_image;
};
}
diff --git a/src/templates/template-load-tab.cpp b/src/templates/template-load-tab.cpp
index febbb3be6..a7b5e63f3 100644
--- a/src/templates/template-load-tab.cpp
+++ b/src/templates/template-load-tab.cpp
@@ -7,38 +7,38 @@ namespace Inkscape {
namespace UI {
-TemplateLoadTab::TemplateLoadTab() :
- _keywordsCombo(true)
+TemplateLoadTab::TemplateLoadTab()
+ : _keywords_combo(true)
{
set_border_width(10);
Gtk::Label *title;
title = manage(new Gtk::Label("Search Tags:"));
- _templatesColumn.pack_start(*title, Gtk::PACK_SHRINK, 10);
+ _templates_column.pack_start(*title, Gtk::PACK_SHRINK, 10);
- _templatesColumn.pack_start(_keywordsCombo, Gtk::PACK_SHRINK, 0);
+ _templates_column.pack_start(_keywords_combo, Gtk::PACK_SHRINK, 0);
title = manage(new Gtk::Label("Templates"));
- _templatesColumn.pack_start(*title, Gtk::PACK_SHRINK, 10);
+ _templates_column.pack_start(*title, Gtk::PACK_SHRINK, 10);
title = manage(new Gtk::Label("Selected template"));
- _templateInfoColumn.pack_start(*title, Gtk::PACK_SHRINK, 10);
+ _template_info_column.pack_start(*title, Gtk::PACK_SHRINK, 10);
_initLists();
- add(_mainBox);
- _mainBox.pack_start(_templatesColumn, Gtk::PACK_SHRINK, 20);
- _mainBox.pack_start(_templateInfoColumn, Gtk::PACK_EXPAND_WIDGET, 10);
+ add(_main_box);
+ _main_box.pack_start(_templates_column, Gtk::PACK_SHRINK, 20);
+ _main_box.pack_start(_template_info_column, Gtk::PACK_EXPAND_WIDGET, 10);
- _templatesColumn.pack_start(_templatesView, Gtk::PACK_SHRINK, 5);
+ _templates_column.pack_start(_templates_view, Gtk::PACK_SHRINK, 5);
Glib::RefPtr<Gtk::TreeSelection> templateSelectionRef =
- _templatesView.get_selection();
+ _templates_view.get_selection();
templateSelectionRef->signal_changed().connect(
sigc::mem_fun(*this, &TemplateLoadTab::_displayTemplateInfo));
- _keywordsCombo.signal_changed().connect(
+ _keywords_combo.signal_changed().connect(
sigc::mem_fun(*this, &TemplateLoadTab::_keywordSelected));
this->show_all();
}
@@ -57,29 +57,29 @@ void TemplateLoadTab::createTemplate()
void TemplateLoadTab::_displayTemplateInfo()
{
- Glib::RefPtr<Gtk::TreeSelection> templateSelectionRef = _templatesView.get_selection();
+ Glib::RefPtr<Gtk::TreeSelection> templateSelectionRef = _templates_view.get_selection();
if (templateSelectionRef->get_selected()) {
- _currentTemplate = (*templateSelectionRef->get_selected())[_templatesColumns.textValue];
+ _current_template = (*templateSelectionRef->get_selected())[_templates_columns.textValue];
}
}
void TemplateLoadTab::_initKeywordsList()
{
- _keywordsCombo.append_text("All");
+ _keywords_combo.append_text("All");
for (int i = 0 ; i < 10 ; ++i) {
- _keywordsCombo.append_text( "Keyword" + Glib::ustring::format(i));
+ _keywords_combo.append_text( "Keyword" + Glib::ustring::format(i));
}
}
void TemplateLoadTab::_initLists()
{
- _templatesRef = Gtk::ListStore::create(_templatesColumns);
- _templatesView.set_model(_templatesRef);
- _templatesView.append_column("", _templatesColumns.textValue);
- _templatesView.set_headers_visible(false);
+ _templates_ref = Gtk::ListStore::create(_templates_columns);
+ _templates_view.set_model(_templates_ref);
+ _templates_view.append_column("", _templates_columns.textValue);
+ _templates_view.set_headers_visible(false);
_initKeywordsList();
_refreshTemplatesList();
@@ -88,18 +88,18 @@ void TemplateLoadTab::_initLists()
void TemplateLoadTab::_keywordSelected()
{
- _currentKeyword = _keywordsCombo.get_active_text();
+ _current_keyword = _keywords_combo.get_active_text();
_refreshTemplatesList();
}
void TemplateLoadTab::_refreshTemplatesList()
{
- _templatesRef->clear();
+ _templates_ref->clear();
for (int i = 0 ; i < 7 ; ++i) {
- Gtk::TreeModel::iterator iter = _templatesRef->append();
+ Gtk::TreeModel::iterator iter = _templates_ref->append();
Gtk::TreeModel::Row row = *iter;
- row[_templatesColumns.textValue] = "Template" + Glib::ustring::format(i);
+ row[_templates_columns.textValue] = "Template" + Glib::ustring::format(i);
}
}
diff --git a/src/templates/template-load-tab.h b/src/templates/template-load-tab.h
index bb55b384c..a9fa7c313 100644
--- a/src/templates/template-load-tab.h
+++ b/src/templates/template-load-tab.h
@@ -31,8 +31,8 @@ protected:
Gtk::TreeModelColumn<Glib::ustring> textValue;
};
- Glib::ustring _currentKeyword;
- Glib::ustring _currentTemplate;
+ Glib::ustring _current_keyword;
+ Glib::ustring _current_template;
virtual void _displayTemplateInfo();
virtual void _initKeywordsList();
@@ -41,15 +41,15 @@ protected:
void _initLists();
void _keywordSelected();
- Gtk::HBox _mainBox;
- Gtk::VBox _templatesColumn;
- Gtk::VBox _templateInfoColumn;
+ Gtk::HBox _main_box;
+ Gtk::VBox _templates_column;
+ Gtk::VBox _template_info_column;
- Gtk::ComboBoxText _keywordsCombo;
+ Gtk::ComboBoxText _keywords_combo;
- Gtk::TreeView _templatesView;
- Glib::RefPtr<Gtk::ListStore> _templatesRef;
- StringModelColumns _templatesColumns;
+ Gtk::TreeView _templates_view;
+ Glib::RefPtr<Gtk::ListStore> _templates_ref;
+ StringModelColumns _templates_columns;
};
generated by cgit v1.2.3 (git 2.25.1) at 2026-07-24 03:47:24 +0000