From 996b199b7b55084ca7ba2e144d07bfb7bf89bb3f Mon Sep 17 00:00:00 2001 From: joncruz Date: Sun, 9 Apr 2006 05:49:41 +0000 Subject: [PATCH] Adding in new icon size --- src/dialogs/swatches.cpp | 4 ++-- src/dialogs/swatches.h | 2 +- src/ui/previewable.h | 4 ++-- src/ui/previewfillable.h | 6 +++--- src/ui/previewholder.cpp | 6 +++--- src/ui/previewholder.h | 7 ++++--- src/ui/widget/panel.cpp | 17 ++++++++++++----- 7 files changed, 27 insertions(+), 19 deletions(-) diff --git a/src/dialogs/swatches.cpp b/src/dialogs/swatches.cpp index a4b9a0d7d..bd2ec169c 100644 --- a/src/dialogs/swatches.cpp +++ b/src/dialogs/swatches.cpp @@ -426,7 +426,7 @@ void ColorItem::_colorDefChanged(void* data) } -Gtk::Widget* ColorItem::getPreview(PreviewStyle style, ViewType view, Gtk::BuiltinIconSize size) +Gtk::Widget* ColorItem::getPreview(PreviewStyle style, ViewType view, Inkscape::IconSize size) { Gtk::Widget* widget = 0; if ( style == PREVIEW_STYLE_BLURB ) { @@ -435,7 +435,7 @@ Gtk::Widget* ColorItem::getPreview(PreviewStyle style, ViewType view, Gtk::Built widget = lbl; } else { Glib::ustring blank(" "); - if ( size == Gtk::ICON_SIZE_MENU ) { + if ( size == Inkscape::ICON_SIZE_MENU || size == Inkscape::ICON_SIZE_DECORATION ) { blank = " "; } diff --git a/src/dialogs/swatches.h b/src/dialogs/swatches.h index 965c32240..7e1357c48 100644 --- a/src/dialogs/swatches.h +++ b/src/dialogs/swatches.h @@ -43,7 +43,7 @@ public: virtual ColorItem &operator=(ColorItem const &other); virtual Gtk::Widget* getPreview(PreviewStyle style, ViewType view, - Gtk::BuiltinIconSize size); + Inkscape::IconSize size); void buttonClicked(bool secondary = false); ColorDef def; diff --git a/src/ui/previewable.h b/src/ui/previewable.h index 86ee71ca5..dcf638df5 100644 --- a/src/ui/previewable.h +++ b/src/ui/previewable.h @@ -14,7 +14,7 @@ #include - +#include "icon-size.h" namespace Inkscape { namespace UI { @@ -40,7 +40,7 @@ class Previewable public: // TODO need to add some nice parameters virtual ~Previewable() {} - virtual Gtk::Widget* getPreview( PreviewStyle style, ViewType view, Gtk::BuiltinIconSize size ) = 0; + virtual Gtk::Widget* getPreview( PreviewStyle style, ViewType view, Inkscape::IconSize size ) = 0; }; diff --git a/src/ui/previewfillable.h b/src/ui/previewfillable.h index f4a67887e..e73edbf63 100644 --- a/src/ui/previewfillable.h +++ b/src/ui/previewfillable.h @@ -14,7 +14,7 @@ #include "previewable.h" - +#include "../icon-size.h" namespace Inkscape { namespace UI { @@ -27,9 +27,9 @@ public: virtual void addPreview( Previewable* preview ) = 0; virtual void freezeUpdates() = 0; virtual void thawUpdates() = 0; - virtual void setStyle(Gtk::BuiltinIconSize size, ViewType type) = 0; + virtual void setStyle( Inkscape::IconSize size, ViewType type) = 0; virtual void setOrientation( Gtk::AnchorType how ) = 0; - virtual Gtk::BuiltinIconSize getPreviewSize() const = 0; + virtual Inkscape::IconSize getPreviewSize() const = 0; virtual ViewType getPreviewType() const = 0; }; diff --git a/src/ui/previewholder.cpp b/src/ui/previewholder.cpp index b89e68adc..f48cc1ca0 100644 --- a/src/ui/previewholder.cpp +++ b/src/ui/previewholder.cpp @@ -35,7 +35,7 @@ PreviewHolder::PreviewHolder() : _prefCols(0), _updatesFrozen(false), _anchor(Gtk::ANCHOR_CENTER), - _baseSize(Gtk::ICON_SIZE_MENU), + _baseSize(Inkscape::ICON_SIZE_MENU), _view(VIEW_TYPE_LIST) { _scroller = manage(new Gtk::ScrolledWindow()); @@ -123,7 +123,7 @@ void PreviewHolder::thawUpdates() rebuildUI(); } -void PreviewHolder::setStyle(Gtk::BuiltinIconSize size, ViewType view) +void PreviewHolder::setStyle( Inkscape::IconSize size, ViewType view ) { if ( size != _baseSize || view != _view ) { _baseSize = size; @@ -215,7 +215,7 @@ void PreviewHolder::calcGridSize( const Gtk::Widget* thing, int itemCount, int& width = w2; } } else { - width = _baseSize == Gtk::ICON_SIZE_MENU ? COLUMNS_FOR_SMALL : COLUMNS_FOR_LARGE; + width = (_baseSize == Inkscape::ICON_SIZE_MENU || _baseSize == Inkscape::ICON_SIZE_DECORATION) ? COLUMNS_FOR_SMALL : COLUMNS_FOR_LARGE; if ( _prefCols > 0 ) { width = _prefCols; } diff --git a/src/ui/previewholder.h b/src/ui/previewholder.h index 53ffd5f05..42f5b119b 100644 --- a/src/ui/previewholder.h +++ b/src/ui/previewholder.h @@ -17,6 +17,7 @@ #include #include #include "previewfillable.h" +#include "../icon-size.h" namespace Inkscape { namespace UI { @@ -31,11 +32,11 @@ public: virtual void addPreview( Previewable* preview ); virtual void freezeUpdates(); virtual void thawUpdates(); - virtual void setStyle(Gtk::BuiltinIconSize size, ViewType view); + virtual void setStyle( Inkscape::IconSize size, ViewType view ); virtual void setOrientation( Gtk::AnchorType how ); virtual int getColumnPref() const { return _prefCols; } virtual void setColumnPref( int cols ); - virtual Gtk::BuiltinIconSize getPreviewSize() const { return _baseSize; } + virtual Inkscape::IconSize getPreviewSize() const { return _baseSize; } virtual ViewType getPreviewType() const { return _view; } protected: @@ -53,7 +54,7 @@ private: int _prefCols; bool _updatesFrozen; Gtk::AnchorType _anchor; - Gtk::BuiltinIconSize _baseSize; + Inkscape::IconSize _baseSize; ViewType _view; }; diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp index 7ee919cb4..f00d736ae 100644 --- a/src/ui/widget/panel.cpp +++ b/src/ui/widget/panel.cpp @@ -18,6 +18,7 @@ #include #include "panel.h" +#include "../../icon-size.h" #include "../../prefs-utils.h" namespace Inkscape { @@ -91,6 +92,7 @@ void Panel::init() menu = new Gtk::Menu(); { const char *things[] = { + N_("tiny"), N_("small"), N_("medium"), N_("large"), @@ -220,22 +222,27 @@ void Panel::bounceCall(int i, int j) switch ( j ) { case 0: { - _fillable->setStyle(Gtk::ICON_SIZE_MENU, currType); + _fillable->setStyle(Inkscape::ICON_SIZE_DECORATION, currType); } break; case 1: { - _fillable->setStyle(Gtk::ICON_SIZE_SMALL_TOOLBAR, currType); + _fillable->setStyle(Inkscape::ICON_SIZE_MENU, currType); } break; case 2: { - _fillable->setStyle(Gtk::ICON_SIZE_BUTTON, currType); + _fillable->setStyle(Inkscape::ICON_SIZE_SMALL_TOOLBAR, currType); } break; case 3: { - _fillable->setStyle(Gtk::ICON_SIZE_DIALOG, currType); + _fillable->setStyle(Inkscape::ICON_SIZE_BUTTON, currType); + } + break; + case 4: + { + _fillable->setStyle(Inkscape::ICON_SIZE_DIALOG, currType); } break; default: @@ -246,7 +253,7 @@ void Panel::bounceCall(int i, int j) case 1: if (_prefs_path) prefs_set_int_attribute (_prefs_path, "panel_mode", j); if ( _fillable ) { - Gtk::BuiltinIconSize currSize = _fillable->getPreviewSize(); + Inkscape::IconSize currSize = _fillable->getPreviewSize(); switch ( j ) { case 0: { -- 2.30.2