diff options
| author | Denis Declara <declara91@gmail.com> | 2012-05-09 15:03:55 +0000 |
|---|---|---|
| committer | Denis Declara <declara91@gmail.com> | 2012-05-09 15:03:55 +0000 |
| commit | 2b693f8037ad4b25b368376274811f20f5864c1b (patch) | |
| tree | 0e77d3c7952044383a4f272e72b32939881eff7f /src/ui | |
| parent | Fixed runtime assertion about Parent beeing Null (diff) | |
| download | inkscape-2b693f8037ad4b25b368376274811f20f5864c1b.tar.gz inkscape-2b693f8037ad4b25b368376274811f20f5864c1b.zip | |
Renamed files to better match coding conventions
(bzr r11073.1.31)
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/ui/dialog/Makefile_insert | 8 | ||||
| -rw-r--r-- | src/ui/dialog/grid-arrange-tab.cpp (renamed from src/ui/dialog/gridarrangetab.cpp) | 2 | ||||
| -rw-r--r-- | src/ui/dialog/grid-arrange-tab.h (renamed from src/ui/dialog/gridarrangetab.h) | 2 | ||||
| -rw-r--r-- | src/ui/dialog/polar-arrange-tab.cpp (renamed from src/ui/dialog/polararrangetab.cpp) | 2 | ||||
| -rw-r--r-- | src/ui/dialog/polar-arrange-tab.h (renamed from src/ui/dialog/polararrangetab.h) | 2 | ||||
| -rw-r--r-- | src/ui/dialog/tile.cpp | 4 | ||||
| -rw-r--r-- | src/ui/widget/anchor-selector.cpp | 19 | ||||
| -rw-r--r-- | src/ui/widget/anchor-selector.h | 19 |
9 files changed, 52 insertions, 14 deletions
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt index 22f6b2bab..7435720fd 100644 --- a/src/ui/CMakeLists.txt +++ b/src/ui/CMakeLists.txt @@ -43,7 +43,7 @@ set(ui_SRC dialog/find.cpp dialog/floating-behavior.cpp dialog/glyphs.cpp - dialog/gridarrangetab.cpp + dialog/grid-arrange-tab.cpp dialog/guides.cpp dialog/icon-preview.cpp dialog/inkscape-preferences.cpp @@ -57,7 +57,7 @@ set(ui_SRC dialog/object-attributes.cpp dialog/object-properties.cpp dialog/ocaldialogs.cpp - dialog/polararrangetab.cpp + dialog/polar-arrange-tab.cpp dialog/print-colors-preview-dialog.cpp dialog/print.cpp dialog/scriptdialog.cpp @@ -160,7 +160,7 @@ set(ui_SRC dialog/floating-behavior.h dialog/glyphs.h dialog/guides.h - dialog/gridarrangetab.h + dialog/grid-arrange-tab.h dialog/icon-preview.h dialog/inkscape-preferences.h dialog/input.h @@ -174,7 +174,7 @@ set(ui_SRC dialog/object-properties.h dialog/ocaldialogs.h dialog/panel-dialog.h - dialog/polararrangetab.h + dialog/polar-arrange-tab.h dialog/print-colors-preview-dialog.h dialog/print.h dialog/scriptdialog.h diff --git a/src/ui/dialog/Makefile_insert b/src/ui/dialog/Makefile_insert index 34cceae54..53533a08f 100644 --- a/src/ui/dialog/Makefile_insert +++ b/src/ui/dialog/Makefile_insert @@ -49,8 +49,8 @@ ink_common_sources += \ ui/dialog/floating-behavior.h \ ui/dialog/glyphs.cpp \ ui/dialog/glyphs.h \ - ui/dialog/gridarrangetab.h \ - ui/dialog/gridarrangetab.cpp \ + ui/dialog/grid-arrange-tab.h \ + ui/dialog/grid-arrange-tab.cpp \ ui/dialog/guides.cpp \ ui/dialog/guides.h \ ui/dialog/icon-preview.cpp \ @@ -78,8 +78,8 @@ ink_common_sources += \ ui/dialog/object-properties.cpp \ ui/dialog/object-properties.h \ ui/dialog/panel-dialog.h \ - ui/dialog/polararrangetab.cpp \ - ui/dialog/polararrangetab.h \ + ui/dialog/polar-arrange-tab.cpp \ + ui/dialog/polar-arrange-tab.h \ ui/dialog/print.cpp \ ui/dialog/print.h \ ui/dialog/print-colors-preview-dialog.cpp \ diff --git a/src/ui/dialog/gridarrangetab.cpp b/src/ui/dialog/grid-arrange-tab.cpp index fca7c5b0e..54b667ed9 100644 --- a/src/ui/dialog/gridarrangetab.cpp +++ b/src/ui/dialog/grid-arrange-tab.cpp @@ -19,7 +19,7 @@ # include <config.h> #endif -#include "ui/dialog/gridarrangetab.h" +#include "ui/dialog/grid-arrange-tab.h" #include <gtk/gtk.h> //for GTK_RESPONSE* types #include <glibmm/i18n.h> #include <gtkmm/stock.h> diff --git a/src/ui/dialog/gridarrangetab.h b/src/ui/dialog/grid-arrange-tab.h index 16780e55f..7e90accf1 100644 --- a/src/ui/dialog/gridarrangetab.h +++ b/src/ui/dialog/grid-arrange-tab.h @@ -102,7 +102,7 @@ private: // Alignment Gtk::Label AlignLabel; - AnchorSelector AlignmentSelector; + Inkscape::UI::Widget::AnchorSelector AlignmentSelector; double VertAlign; double HorizAlign; diff --git a/src/ui/dialog/polararrangetab.cpp b/src/ui/dialog/polar-arrange-tab.cpp index 6968be35a..a1df794a5 100644 --- a/src/ui/dialog/polararrangetab.cpp +++ b/src/ui/dialog/polar-arrange-tab.cpp @@ -10,7 +10,7 @@ #include <2geom/transforms.h> #include <glibmm/i18n.h> -#include "ui/dialog/polararrangetab.h" +#include "ui/dialog/polar-arrange-tab.h" #include "ui/dialog/tile.h" #include "verbs.h" diff --git a/src/ui/dialog/polararrangetab.h b/src/ui/dialog/polar-arrange-tab.h index 24760a8bc..e62ebd76b 100644 --- a/src/ui/dialog/polararrangetab.h +++ b/src/ui/dialog/polar-arrange-tab.h @@ -52,7 +52,7 @@ private: Gtk::RadioButtonGroup anchorRadioGroup; Gtk::RadioButton anchorBoundingBoxRadio; Gtk::RadioButton anchorObjectPivotRadio; - AnchorSelector anchorSelector; + Inkscape::UI::Widget::AnchorSelector anchorSelector; Gtk::Label arrangeOnLabel; diff --git a/src/ui/dialog/tile.cpp b/src/ui/dialog/tile.cpp index 917544d3d..c967509f9 100644 --- a/src/ui/dialog/tile.cpp +++ b/src/ui/dialog/tile.cpp @@ -19,8 +19,8 @@ #include "tile.h" #include "verbs.h" -#include "ui/dialog/gridarrangetab.h" -#include "ui/dialog/polararrangetab.h" +#include "ui/dialog/grid-arrange-tab.h" +#include "ui/dialog/polar-arrange-tab.h" namespace Inkscape { namespace UI { diff --git a/src/ui/widget/anchor-selector.cpp b/src/ui/widget/anchor-selector.cpp index 87f50cf5f..82e27ee89 100644 --- a/src/ui/widget/anchor-selector.cpp +++ b/src/ui/widget/anchor-selector.cpp @@ -12,6 +12,10 @@ #include "widgets/icon.h" #include "ui/icon-names.h" +namespace Inkscape { +namespace UI { +namespace Widget { + void AnchorSelector::setupButton(const Glib::ustring& icon, Gtk::ToggleButton& button) { Gtk::Widget* buttonIcon = Gtk::manage(sp_icon_get_icon(icon, Inkscape::ICON_SIZE_SMALL_TOOLBAR)); buttonIcon->show(); @@ -76,3 +80,18 @@ void AnchorSelector::setAlignment(int horizontal, int vertical) _buttons[index].set_active(!_buttons[index].get_active()); } } + +} // namespace Widget +} // namespace UI +} // namespace Inkscape + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: filetype=c++:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 : diff --git a/src/ui/widget/anchor-selector.h b/src/ui/widget/anchor-selector.h index 361528d11..2263438e3 100644 --- a/src/ui/widget/anchor-selector.h +++ b/src/ui/widget/anchor-selector.h @@ -12,6 +12,10 @@ #include <gtkmm.h> +namespace Inkscape { +namespace UI { +namespace Widget { + class AnchorSelector : public Gtk::Alignment { private: @@ -37,4 +41,19 @@ public: virtual ~AnchorSelector(); }; +} // namespace Widget +} // namespace UI +} // namespace Inkscape + #endif /* ANCHOR_SELECTOR_H_ */ + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: filetype=c++:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 : |
