Changeset dddf956080b7fa0418b32a1b5b9d4003a4f239cc

Show
Ignore:
Timestamp:
05/09/08 14:43:38 (5 years ago)
Author:
Armin Burgmeier <armin@…>
Parents:
065aeb81158ce490b30f38125a0093ae55a45366
Children:
0958ce6e3faf508d641138f02672d19883e39604
git-committer:
Armin Burgmeier <armin@arbur.net> / 2008-05-09T14:43:38Z+0200
Message:

Reordered source file hierarchy, added DocumentLocationDialog?

2008-05-09 Armin Burgmeier <armin@…>

  • inc/util/Makefile.am:
  • inc/util/color.hpp:
  • inc/util/config.hpp:
  • inc/util/defaultaccumulator.hpp:
  • inc/util/encoding.hpp:
  • inc/util/i18n.hpp:
  • inc/util/resolv.hpp:
  • inc/util/serialize.hpp:
  • inc/core/Makefile.am:
  • inc/core/browser.hpp:
  • inc/core/docwindow.hpp:
  • inc/core/encodingselector.hpp:
  • inc/core/folder.hpp:
  • inc/core/header.hpp:
  • inc/core/iconmanager.hpp:
  • inc/core/preferences.hpp:
  • inc/core/statusbar.hpp:
  • inc/core/toolwindow.hpp:
  • inc/dialogs/Makefile.am:
  • inc/dialogs/finddialog.hpp:
  • inc/dialogs/gotodialog.hpp:
  • inc/dialogs/initialdialog.hpp:
  • inc/dialogs/preferencesdialog.hpp:
  • inc/commands/Makefile.am:
  • inc/commands/browser-commands.hpp:
  • inc/window.hpp:
  • inc/Makefile.am:
  • src/util/Makefile.am:
  • src/util/color.cpp:
  • src/util/config.cpp:
  • src/util/encoding.cpp:
  • src/util/i18n.cpp:
  • src/util/resolv.cpp:
  • src/util/serialize.cpp:
  • src/core/Makefile.am:
  • src/core/browser.cpp:
  • src/core/docwindow.cpp:
  • src/core/encodingselector.cpp:
  • src/core/folder.cpp:
  • src/core/header.cpp:
  • src/core/iconmanager.cpp:
  • src/core/preferences.cpp:
  • src/core/statusbar.cpp:
  • src/core/toolwindow.cpp:
  • src/dialogs/Makefile.am:
  • src/dialogs/finddialog.cpp:
  • src/dialogs/gotodialog.cpp:
  • src/dialogs/initialdialog.cpp:
  • src/dialogs/preferencesdialog.cpp:
  • src/commands/Makefile.am:
  • src/commands/browser-commands.cpp:
  • src/dragdrop.cpp:
  • src/main.cpp:
  • src/window.cpp:
  • src/Makefile.am:
  • Makefile.am:
  • configure.ac: Reordered file hierarchy, fixing includes.
  • inc/dialogs/documentlocationdialog.hpp:
  • src/dialogs/documentlocationdialog.cpp: Added a dialog allowing the user to select on which directory and server to create a document.
  • inc/commands/file-commands.hpp:
  • src/commands/file-commands.cpp: Added functionality for File/New using the new dialog.
Files:
8 added
14 modified
2 copied
39 moved

Legend:

Unmodified
Added
Removed

  • ChangeLog

    r065aeb8 rdddf956  
     12008-05-09  Armin Burgmeier  <armin@0x539.de> 
     2 
     3        * inc/util/Makefile.am: 
     4        * inc/util/color.hpp: 
     5        * inc/util/config.hpp: 
     6        * inc/util/defaultaccumulator.hpp: 
     7        * inc/util/encoding.hpp: 
     8        * inc/util/i18n.hpp: 
     9        * inc/util/resolv.hpp: 
     10        * inc/util/serialize.hpp: 
     11        * inc/core/Makefile.am: 
     12        * inc/core/browser.hpp: 
     13        * inc/core/docwindow.hpp: 
     14        * inc/core/encodingselector.hpp: 
     15        * inc/core/folder.hpp: 
     16        * inc/core/header.hpp: 
     17        * inc/core/iconmanager.hpp: 
     18        * inc/core/preferences.hpp: 
     19        * inc/core/statusbar.hpp: 
     20        * inc/core/toolwindow.hpp: 
     21        * inc/dialogs/Makefile.am: 
     22        * inc/dialogs/finddialog.hpp: 
     23        * inc/dialogs/gotodialog.hpp: 
     24        * inc/dialogs/initialdialog.hpp: 
     25        * inc/dialogs/preferencesdialog.hpp: 
     26        * inc/commands/Makefile.am: 
     27        * inc/commands/browser-commands.hpp: 
     28        * inc/window.hpp: 
     29        * inc/Makefile.am: 
     30        * src/util/Makefile.am: 
     31        * src/util/color.cpp: 
     32        * src/util/config.cpp: 
     33        * src/util/encoding.cpp: 
     34        * src/util/i18n.cpp: 
     35        * src/util/resolv.cpp: 
     36        * src/util/serialize.cpp: 
     37        * src/core/Makefile.am: 
     38        * src/core/browser.cpp: 
     39        * src/core/docwindow.cpp: 
     40        * src/core/encodingselector.cpp: 
     41        * src/core/folder.cpp: 
     42        * src/core/header.cpp: 
     43        * src/core/iconmanager.cpp: 
     44        * src/core/preferences.cpp: 
     45        * src/core/statusbar.cpp: 
     46        * src/core/toolwindow.cpp: 
     47        * src/dialogs/Makefile.am: 
     48        * src/dialogs/finddialog.cpp: 
     49        * src/dialogs/gotodialog.cpp: 
     50        * src/dialogs/initialdialog.cpp: 
     51        * src/dialogs/preferencesdialog.cpp: 
     52        * src/commands/Makefile.am: 
     53        * src/commands/browser-commands.cpp: 
     54        * src/dragdrop.cpp: 
     55        * src/main.cpp: 
     56        * src/window.cpp: 
     57        * src/Makefile.am: 
     58        * Makefile.am: 
     59        * configure.ac: Reordered file hierarchy, fixing includes. 
     60 
     61        * inc/dialogs/documentlocationdialog.hpp: 
     62        * src/dialogs/documentlocationdialog.cpp: Added a dialog allowing the 
     63        user to select on which directory and server to create a document. 
     64 
     65        * inc/commands/file-commands.hpp: 
     66        * src/commands/file-commands.cpp: Added functionality for File/New 
     67        using the new dialog. 
     68 
    1692008-04-20  Armin Burgmeier  <armin@0x539.de> 
    270 

  • Makefile.am

    rb5b6b61 rdddf956  
    88bin_PROGRAMS = gobby 
    99 
     10gobby_LDADD = $(gobby_LIBS) \ 
     11        src/libgobby.a \ 
     12        src/commands/libgobby-commands.a \ 
     13        src/dialogs/libgobby-dialogs.a \ 
     14        src/core/libgobby-core.a \ 
     15        src/util/libgobby-util.a 
     16 
    1017if WIN32 
    11 gobby_LDADD = $(gobby_LIBS) src/libgobby.a -lole32 -luuid 
     18gobby_LDADD += -lole32 -luuid 
    1219gobby_LDFLAGS = -Wl,--enable-runtime-pseudo-reloc -mwindows win32/gobby.res 
    13 else 
    14 gobby_LDADD = $(gobby_LIBS) src/libgobby.a src/commands/libgobby-commands.a 
    1520endif 
    1621 

  • configure.ac

    rb5b6b61 rdddf956  
    7272 
    7373                inc/Makefile 
     74                        inc/util/Makefile 
     75                        inc/core/Makefile 
     76                        inc/dialogs/Makefile 
    7477                        inc/commands/Makefile 
    7578                src/Makefile 
     79                        src/util/Makefile 
     80                        src/core/Makefile 
     81                        src/dialogs/Makefile 
    7682                        src/commands/Makefile 
    7783 

  • inc/Makefile.am

    rb5b6b61 rdddf956  
    1 SUBDIRS = commands 
     1SUBDIRS = util core dialogs commands 
    22 
    33noinst_HEADERS = \ 
    4         browser.hpp \ 
    5         colorutil.hpp \ 
    6         config.hpp \ 
    7         default_accumulator.hpp \ 
    8         docwindow.hpp \ 
    94        dragdrop.hpp \ 
    10         encoding.hpp \ 
    11         encoding_selector.hpp \ 
    12         finddialog.hpp \ 
    13         folder.hpp \ 
    14         gotodialog.hpp \ 
    15         header.hpp \ 
    16         i18n.hpp \ 
    17         icon.hpp \ 
    18         initialdialog.hpp \ 
    19         preferences.hpp \ 
    20         preferencesdialog.hpp \ 
    21         resolv.hpp \ 
    22         serialize.hpp \ 
    23         statusbar.hpp \ 
    24         toolwindow.hpp \ 
    255        window.hpp  

  • inc/commands/Makefile.am

    rb5b6b61 rdddf956  
    11 
    22noinst_HEADERS = \ 
    3         browser-commands.hpp 
     3        browser-commands.hpp \ 
     4        file-commands.hpp 

  • inc/commands/browser-commands.hpp

    re631cf1 rdddf956  
    2020#define _GOBBY_BROWSER_COMMANDS_HPP_ 
    2121 
    22 #include "browser.hpp" 
    23 #include "folder.hpp" 
    24 #include "statusbar.hpp" 
     22#include "core/browser.hpp" 
     23#include "core/folder.hpp" 
     24#include "core/statusbar.hpp" 
    2525 
    2626#include <libinfinity/client/infc-browser.h> 

  • inc/commands/file-commands.hpp

    r36fa5fe rdddf956  
    1717 */ 
    1818 
    19 #ifndef _GOBBY_DEFAULT_ACCUMULATOR_HPP_ 
    20 #define _GOBBY_DEFAULT_ACCUMULATOR_HPP_ 
     19#ifndef _GOBBY_FILE_COMMANDS_HPP_ 
     20#define _GOBBY_FILE_COMMANDS_HPP_ 
     21 
     22#include "dialogs/documentlocationdialog.hpp" 
     23#include "core/header.hpp" 
     24#include "core/browser.hpp" 
     25 
     26#include <gtkmm/window.h> 
     27#include <sigc++/trackable.h> 
    2128 
    2229namespace Gobby 
    2330{ 
    2431 
    25 /** Accumulator for signals with return type that defaults to a value if no 
    26  * signal handler is connected. 
    27  */ 
     32class FileCommands: public sigc::trackable 
     33{ 
     34public: 
     35        FileCommands(Gtk::Window& parent, Header& header, 
     36                     const Browser& browser, Folder& folder, 
     37                     StatusBar& status_bar); 
    2838 
    29 template<typename return_type, return_type default_return> 
    30 class default_accumulator { 
    31 public: 
    32         typedef return_type result_type; 
     39protected: 
     40        void on_new(); 
     41        void on_location_dialog_response(int id); 
    3342 
    34         template<typename iterator> 
    35         result_type operator()(iterator begin, iterator end) const { 
    36                 return_type result = default_return; 
    37                 for(; begin != end; ++ begin) 
    38                         result = *begin; 
    39                 return result; 
    40         } 
     43        Gtk::Window& m_parent; 
     44        const Browser& m_browser; 
     45        Folder& m_folder; 
     46        StatusBar& m_status_bar; 
     47 
     48        std::auto_ptr<DocumentLocationDialog> m_location_dialog; 
    4149}; 
    4250 
    43 } // namespace Gobby 
    44  
    45 #endif // _GOBBY_DEFAULT_ACCUMULATOR_HPP_ 
     51} 
     52         
     53#endif // _GOBBY_FILE_COMMANDS_HPP_ 

  • inc/core/browser.hpp

    r065aeb8 rdddf956  
    2020#define _GOBBY_BROWSER_HPP_ 
    2121 
     22#include "core/statusbar.hpp" 
     23#include "core/preferences.hpp" 
     24#include "util/resolv.hpp" 
     25 
    2226#include <libinfgtk/inf-gtk-io.h> 
    2327#include <libinfgtk/inf-gtk-browser-store.h> 
    … …  
    3438#include <gtkmm/label.h> 
    3539#include <gtkmm/treeiter.h> 
    36  
    37 #include "resolv.hpp" 
    38 #include "preferences.hpp" 
    39 #include "statusbar.hpp" 
    4040 
    4141namespace Gobby 
    … …  
    6060                Preferences& preferences); 
    6161        ~Browser(); 
     62 
     63        InfGtkBrowserStore* get_store() { return m_browser_store; } 
     64        const InfGtkBrowserStore* get_store() const { 
     65                return m_browser_store; 
     66        } 
    6267 
    6368        SignalActivate signal_activate() const { return m_signal_activate; } 

  • inc/core/folder.hpp

    rb5b6b61 rdddf956  
    2020#define _GOBBY_FOLDER_HPP_ 
    2121 
     22#include "core/docwindow.hpp" 
     23#include "core/preferences.hpp" 
     24#include "util/defaultaccumulator.hpp" 
     25 
     26#include <gtkmm/notebook.h> 
    2227#include <sigc++/signal.h> 
     28 
    2329#include <gtksourceview/gtksourcelanguagemanager.h> 
    24 #include <gtkmm/notebook.h> 
    25  
    26 #include "docwindow.hpp" 
    27 #include "preferences.hpp" 
    28 #include "default_accumulator.hpp" 
    2930 
    3031namespace Gobby 

  • inc/core/preferences.hpp

    r00f0fd0 rdddf956  
    2020#define _GOBBY_PREFERENCES_HPP_ 
    2121 
     22#include "util/config.hpp" 
     23 
     24#include "features.hpp" 
     25 
    2226#include <gtkmm/toolbar.h> 
    23 #include "features.hpp" 
    24 #include "config.hpp" 
    2527 
    2628namespace Gobby 

  • inc/dialogs/documentlocationdialog.hpp

    r00f0fd0 rdddf956  
    1717 */ 
    1818 
    19 #ifndef _GOBBY_INITIALDIALOG_HPP_ 
    20 #define _GOBBY_INITIALDIALOG_HPP_ 
     19#ifndef _GOBBY_DOCUMENTLOCATIONDIALOG_HPP_ 
     20#define _GOBBY_DOCUMENTLOCATIONDIALOG_HPP_ 
    2121 
    2222#include <gtkmm/dialog.h> 
    23 #include <gtkmm/box.h> 
     23#include <gtkmm/table.h> 
     24#include <gtkmm/entry.h> 
    2425#include <gtkmm/label.h> 
    25 #include <gtkmm/image.h> 
    26 #include <gtkmm/entry.h> 
    27 #include <gtkmm/table.h> 
    28 #include <gtkmm/colorbutton.h> 
    29 #include "preferences.hpp" 
    30 #include "icon.hpp" 
     26#include <gtkmm/scrolledwindow.h> 
     27 
     28#include <libinfgtk/inf-gtk-browser-model.h> 
     29#include <libinfgtk/inf-gtk-browser-model-filter.h> 
     30#include <libinfgtk/inf-gtk-browser-view.h> 
    3131 
    3232namespace Gobby 
    3333{ 
    3434 
    35 class InitialDialog : public Gtk::Dialog 
     35class DocumentLocationDialog : public Gtk::Dialog 
    3636{ 
    3737public: 
    38         InitialDialog(Gtk::Window& parent, 
    39                       Preferences& preferences, 
    40                       const IconManager& icon_manager); 
     38        DocumentLocationDialog(Gtk::Window& parent, 
     39                               InfGtkBrowserModel* model); 
     40        ~DocumentLocationDialog(); 
    4141 
     42        Glib::ustring get_document_name() const; 
     43        void set_document_name(const Glib::ustring& document_name); 
     44 
     45        InfcBrowser* get_selected_directory(InfcBrowserIter* iter) const; 
    4246protected: 
    43         virtual void on_response(int id); 
    44  
    45         Preferences& m_preferences; 
    46  
    47         Gtk::VBox m_topbox; 
    48         Gtk::Label m_title; 
    49  
    50         Gtk::HBox m_hbox; 
    51         Gtk::Image m_image; 
    52  
    53         Gtk::VBox m_vbox; 
    54         Gtk::Label m_intro; 
     47        virtual void on_show(); 
    5548 
    5649        Gtk::Table m_table; 
    … …  
    5851        Gtk::Entry m_name_entry; 
    5952 
    60         Gtk::Label m_color_label; 
    61         Gtk::ColorButton m_color_button; 
     53        Gtk::Label m_location_label; 
     54        InfGtkBrowserModelFilter* m_filter_model; 
     55        Gtk::ScrolledWindow m_scroll; 
     56        InfGtkBrowserView* m_view; 
    6257}; 
    6358 
    6459} 
    6560 
    66 #endif // _GOBBY_INITIALDIALOG_HPP_ 
     61#endif // _GOBBY_DOCUMENTLOCATIONDIALOG_HPP_ 
    6762 

  • inc/dialogs/finddialog.hpp

    r36fa5fe rdddf956  
    2020#define _GOBBY_FINDDIALOG_HPP_ 
    2121 
    22 #include "docwindow.hpp" 
    23 #include "toolwindow.hpp" 
     22#include "core/folder.hpp" 
     23#include "core/docwindow.hpp" 
     24#include "core/toolwindow.hpp" 
    2425 
    2526#include <gtkmm/window.h> 
    … …  
    3637{ 
    3738 
    38 class Window; 
    39  
    4039class FindDialog: public ToolWindow 
    4140{ 
    4241public: 
    43         FindDialog(Gobby::Window& parent); 
     42        FindDialog(Gtk::Window& parent, Folder& folder); 
    4443 
    4544        void set_search_only(bool search_only); 
    … …  
    8483                         Gtk::TextIter& match_end); 
    8584 
    86         Gobby::Window& m_gobby; 
     85        Folder& m_folder; 
    8786 
    8887        Gtk::HBox m_box_main; 

  • inc/dialogs/gotodialog.hpp

    r5843bef rdddf956  
    2020#define _GOBBY_GOTODIALOG_HPP_ 
    2121 
     22#include "core/toolwindow.hpp" 
     23#include "core/folder.hpp" 
     24 
    2225#include <gtkmm/separator.h> 
    2326#include <gtkmm/box.h> 
    … …  
    2528#include <gtkmm/spinbutton.h> 
    2629 
    27 #include "toolwindow.hpp" 
    28  
    2930namespace Gobby 
    3031{ 
    31  
    32 class Window; 
    3332 
    3433class GotoDialog: public ToolWindow 
    3534{ 
    3635public: 
    37         GotoDialog(Gobby::Window& parent); 
     36        GotoDialog(Gtk::Window& parent, Folder& m_folder); 
    3837 
    3938protected: 
    … …  
    4140        virtual void on_goto(); 
    4241 
    43         Gobby::Window& m_window; 
     42        Folder& m_folder; 
    4443 
    4544        Gtk::VBox m_mainbox; 

  • inc/dialogs/initialdialog.hpp

    r00f0fd0 rdddf956  
    2020#define _GOBBY_INITIALDIALOG_HPP_ 
    2121 
     22#include "core/preferences.hpp" 
     23#include "core/iconmanager.hpp" 
     24 
    2225#include <gtkmm/dialog.h> 
    2326#include <gtkmm/box.h> 
    … …  
    2730#include <gtkmm/table.h> 
    2831#include <gtkmm/colorbutton.h> 
    29 #include "preferences.hpp" 
    30 #include "icon.hpp" 
    3132 
    3233namespace Gobby 

  • inc/dialogs/preferencesdialog.hpp

    re9bbcc3 rdddf956  
    2020#define _GOBBY_PREFERENCESDIALOG_HPP_ 
    2121 
     22#include "core/preferences.hpp" 
     23 
    2224#include <gtkmm/dialog.h> 
    2325#include <gtkmm/frame.h> 
    … …  
    3234#include <gtkmm/fontbutton.h> 
    3335#include <gtkmm/colorbutton.h> 
    34 #include "preferences.hpp" 
    3536 
    3637namespace Gobby 

  • inc/util/encoding.hpp

    r36fa5fe rdddf956  
    3232 
    3333const std::vector<std::string>& get_encodings(); 
     34 
    3435Glib::ustring convert_to_utf8(const std::string& str, 
    3536                              std::string& encoding); 

  • inc/window.hpp

    rb5b6b61 rdddf956  
    2020#define _GOBBY_WINDOW_HPP_ 
    2121 
    22 #include <queue> 
    23 #include <memory> 
     22#include "features.hpp" 
     23#include "dragdrop.hpp" 
     24 
     25#include "commands/browser-commands.hpp" 
     26#include "commands/file-commands.hpp" 
     27 
     28#include "dialogs/finddialog.hpp" 
     29#include "dialogs/gotodialog.hpp" 
     30#include "dialogs/preferencesdialog.hpp" 
     31#include "dialogs/initialdialog.hpp" 
     32 
     33#include "core/preferences.hpp" 
     34#include "core/iconmanager.hpp" 
     35#include "core/header.hpp" 
     36#include "core/docwindow.hpp" 
     37#include "core/folder.hpp" 
     38#include "core/browser.hpp" 
     39#include "core/statusbar.hpp" 
     40 
     41#include "util/config.hpp" 
    2442 
    2543#include <gtkmm/window.h> 
    … …  
    2846#include <gtkmm/messagedialog.h> 
    2947 
    30 #include "features.hpp" 
    31 #include "preferences.hpp" 
    32 #include "icon.hpp" 
    33 #include "config.hpp" 
    34 #include "header.hpp" 
    35 #include "docwindow.hpp" 
    36 #include "finddialog.hpp" 
    37 #include "gotodialog.hpp" 
    38 #include "preferencesdialog.hpp" 
    39 #include "initialdialog.hpp" 
    40 #include "folder.hpp" 
    41 #include "browser.hpp" 
    42 #include "statusbar.hpp" 
    43 #include "dragdrop.hpp" 
    44  
    45 #include "commands/browser-commands.hpp" 
     48#include <queue> 
     49#include <memory> 
    4650 
    4751namespace Gobby 
    … …  
    8488 
    8589        BrowserCommands m_commands_browser; 
     90        FileCommands m_commands_file; 
    8691 
    8792        // TODO: Can't we use this directly now that the session is 

  • src/.gitignore

    r36fa5fe rdddf956  
    1 libgobby.a 
     1*.a 

  • src/Makefile.am

    rb5b6b61 rdddf956  
    1 SUBDIRS = commands 
     1SUBDIRS = util core dialogs commands 
    22 
    33noinst_LIBRARIES = libgobby.a 
    44 
    55libgobby_a_SOURCES = \ 
    6         browser.cpp \ 
    7         colorutil.cpp \ 
    8         config.cpp \ 
    9         docwindow.cpp \ 
    106        dragdrop.cpp \ 
    11         encoding.cpp \ 
    12         encoding_selector.cpp \ 
    13         finddialog.cpp \ 
    14         folder.cpp \ 
    15         gotodialog.cpp \ 
    16         header.cpp \ 
    17         i18n.cpp \ 
    18         icon.cpp \ 
    19         initialdialog.cpp \ 
    207        main.cpp \ 
    21         preferences.cpp \ 
    22         preferencesdialog.cpp \ 
    23         resolv.cpp \ 
    24         serialize.cpp \ 
    25         statusbar.cpp \ 
    26         toolwindow.cpp \ 
    278        window.cpp 
    289 

  • src/commands/Makefile.am

    rb5b6b61 rdddf956  
    22 
    33libgobby_commands_a_SOURCES = \ 
    4         browser-commands.cpp 
     4        browser-commands.cpp \ 
     5        file-commands.cpp 
    56 
    6 libgobby_commands_a_CPPFLAGS = $(gobby_CFLAGS) -I../../inc/  
     7libgobby_commands_a_CPPFLAGS = $(gobby_CFLAGS) -I../../inc/ \ 
     8                              -DLOCALE_DIR=\""$(datadir)/locale"\" \ 
     9                              -DAPPICON_DIR=\""$(appicondir)"\" \ 
     10                              -DPIXMAPS_DIR=\""$(pixmapdir)"\" 

  • src/commands/browser-commands.cpp

    rf5b0b07 rdddf956  
    1818 
    1919#include "commands/browser-commands.hpp" 
    20 #include "i18n.hpp" 
     20#include "util/i18n.hpp" 
    2121 
    2222#include <libinftext/inf-text-user.h> 

  • src/core/browser.cpp

    r065aeb8 rdddf956  
    1717 */ 
    1818 
    19 #include "browser.hpp" 
    20 #include "i18n.hpp" 
     19#include "core/browser.hpp" 
     20#include "util/i18n.hpp" 
    2121 
    2222#include <libinfinity/inf-config.h> 

  • src/core/docwindow.cpp

    rf5b0b07 rdddf956  
    1919#include "features.hpp" 
    2020 
     21#include "core/preferences.hpp" 
     22#include "core/docwindow.hpp" 
     23 
     24#include <gtkmm/scrolledwindow.h> 
    2125#include <glibmm/pattern.h> 
    22 #include <gtkmm/scrolledwindow.h> 
    2326 
    2427#include <libinftextgtk/inf-text-gtk-buffer.h> 
    2528 
    2629#include <gtksourceview/gtksourcebuffer.h> 
    27  
    28 #include "preferences.hpp" 
    29 #include "docwindow.hpp" 
    3030 
    3131namespace 

  • src/core/encodingselector.cpp

    r36fa5fe rdddf956  
    1717 */ 
    1818 
    19 #include "encoding_selector.hpp" 
    20 #include "encoding.hpp" 
    21 #include "i18n.hpp" 
     19#include "core/encodingselector.hpp" 
     20#include "util/encoding.hpp" 
     21#include "util/i18n.hpp" 
    2222 
    2323#include <gtkmm/liststore.h> 

  • src/core/folder.cpp

    rf5b0b07 rdddf956  
    1717 */ 
    1818 
    19 #include "folder.hpp" 
     19#include "core/folder.hpp" 
    2020 
    2121#include <gtkmm/box.h> 

  • src/core/header.cpp

    rb5b6b61 rdddf956  
    1717 */ 
    1818 
    19 #include "header.hpp" 
    20 #include "icon.hpp" 
    21 #include "i18n.hpp" 
     19#include "core/header.hpp" 
     20#include "core/iconmanager.hpp" 
     21#include "util/i18n.hpp" 
    2222 
    2323#include <gtkmm/stock.h> 

  • src/core/iconmanager.cpp

    r36fa5fe rdddf956  
    1717 */ 
    1818 
     19#include "core/iconmanager.hpp" 
     20#include "util/i18n.hpp" 
     21 
     22#include <gtkmm/stockitem.h> 
    1923#include <glib/gtypes.h> 
    20 #include <gtkmm/stockitem.h> 
    21 #include "i18n.hpp" 
    22 #include "icon.hpp" 
    2324 
    2425#ifdef _WIN32 

  • src/core/preferences.cpp

    r6eef44e rdddf956  
    1818 
    1919#include "features.hpp" 
    20 #include "preferences.hpp" 
     20#include "core/preferences.hpp" 
    2121 
    2222Gobby::Preferences::User::User(Config::ParentEntry& entry): 

  • src/core/statusbar.cpp

    r36fa5fe rdddf956  
    1717 */ 
    1818 
    19 #include "statusbar.hpp" 
     19#include "core/statusbar.hpp" 
    2020 
    2121#include <gtkmm/frame.h> 

  • src/core/toolwindow.cpp

    r38aaa94 rdddf956  
    1717 */ 
    1818 
    19 #include "toolwindow.hpp" 
    2019#include "features.hpp" 
     20#include "core/toolwindow.hpp" 
    2121 
    2222#include <gdk/gdkkeysyms.h> 

  • src/dialogs/finddialog.cpp

    r36fa5fe rdddf956  
    1717 */ 
    1818 
    19 #include "finddialog.hpp" 
    20 #include "window.hpp" 
    21 #include "i18n.hpp" 
     19#include "dialogs/finddialog.hpp" 
     20#include "core/folder.hpp" 
     21#include "util/i18n.hpp" 
    2222 
    2323#include <gtkmm/messagedialog.h> 
    … …  
    3838} 
    3939 
    40 Gobby::FindDialog::FindDialog(Gobby::Window& parent): 
     40Gobby::FindDialog::FindDialog(Gtk::Window& parent, Folder& folder): 
    4141        ToolWindow(parent), 
    42         m_gobby(parent), 
     42        m_folder(folder), 
    4343        m_label_find(_("Find what:"), Gtk::ALIGN_LEFT), 
    4444        m_label_replace(_("Replace with:"), Gtk::ALIGN_LEFT), 
    … …  
    265265Gobby::DocWindow* Gobby::FindDialog::get_document() 
    266266{ 
    267         DocWindow* doc = m_gobby.get_folder().get_current_document(); 
     267        DocWindow* doc = m_folder.get_current_document(); 
    268268 
    269269        if(doc == NULL) 

  • src/dialogs/gotodialog.cpp

    r36fa5fe rdddf956  
    1717 */ 
    1818 
    19 #include "gotodialog.hpp" 
    20 #include "window.hpp" 
    21 #include "i18n.hpp" 
     19#include "dialogs/gotodialog.hpp" 
     20#include "util/i18n.hpp" 
    2221 
    2322#include <gtkmm/messagedialog.h> 
    … …  
    2524#include <gtkmm/stock.h> 
    2625 
    27 Gobby::GotoDialog::GotoDialog(Gobby::Window& parent): 
     26Gobby::GotoDialog::GotoDialog(Gtk::Window& parent, Folder& folder): 
    2827        ToolWindow(parent), 
    29         m_window(parent), 
     28        m_folder(folder), 
    3029        m_lbl_info(_("Line number:"), Gtk::ALIGN_RIGHT), 
    3130        m_btn_close(Gtk::Stock::CLOSE), 
    … …  
    8483        m_ent_line.grab_focus(); 
    8584 
    86         Gobby::DocWindow* window = 
    87                 m_window.get_folder().get_current_document(); 
     85        Gobby::DocWindow* window = m_folder.get_current_document(); 
    8886        if(window != NULL) 
    8987        { 
    … …  
    102100void Gobby::GotoDialog::on_goto() 
    103101{ 
    104         Gobby::DocWindow* window = 
    105                 m_window.get_folder().get_current_document(); 
     102        Gobby::DocWindow* window = m_folder.get_current_document(); 
    106103        if(window != NULL) 
    107104        { 

  • src/dialogs/initialdialog.cpp

    r36fa5fe rdddf956  
    1717 */ 
    1818 
    19 #include "initialdialog.hpp" 
    20 #include "colorutil.hpp" 
    21 #include "i18n.hpp" 
     19#include "dialogs/initialdialog.hpp" 
     20#include "util/color.hpp" 
     21#include "util/i18n.hpp" 
    2222#include "features.hpp" 
    2323 

  • src/dialogs/preferencesdialog.cpp

    r36fa5fe rdddf956  
    1717 */ 
    1818 
    19 #include "preferencesdialog.hpp" 
    20 #include "colorutil.hpp" 
    21 #include "i18n.hpp" 
     19#include "dialogs/preferencesdialog.hpp" 
     20#include "util/color.hpp" 
     21#include "util/i18n.hpp" 
    2222 
    2323#include <gtkmm/messagedialog.h> 

  • src/dragdrop.cpp

    r36fa5fe rdddf956  
    1717 */ 
    1818 
     19#include "core/encodingselector.hpp" 
     20#include "dragdrop.hpp" 
     21#include "window.hpp" 
     22 
    1923#include <string> 
    2024#include <vector> 
    … …  
    2428#include <gdk/gdkwin32.h> 
    2529#endif 
    26  
    27 #include "encoding_selector.hpp" 
    28 #include "dragdrop.hpp" 
    29 #include "window.hpp" 
    3030 
    3131namespace 

  • src/main.cpp

    r36fa5fe rdddf956  
    1717 */ 
    1818 
     19#include "features.hpp" 
    1920#include "window.hpp" 
    20 #include "config.hpp" 
    21 #include "icon.hpp" 
    22 #include "features.hpp" 
     21 
     22#include "core/iconmanager.hpp" 
     23#include "util/config.hpp" 
    2324 
    2425#include <gtkmm/main.h> 

  • src/util/color.cpp

    r99231c7 rdddf956  
    1717 */ 
    1818 
    19 #include "colorutil.hpp" 
     19#include "util/color.hpp" 
    2020 
    2121namespace 

  • src/util/config.cpp

    r36fa5fe rdddf956  
    1717 */ 
    1818 
    19 #include "config.hpp" 
    20 #include "i18n.hpp" 
     19#include "util/config.hpp" 
     20#include "util/i18n.hpp" 
    2121 
    2222#include <glibmm/miscutils.h> 

  • src/util/encoding.cpp

    r36fa5fe rdddf956  
    1717 */ 
    1818 
    19 #include "encoding.hpp" 
    20 #include "i18n.hpp" 
     19#include "util/encoding.hpp" 
     20#include "util/i18n.hpp" 
    2121 
    2222#include <glibmm/convert.h> 

  • src/util/i18n.cpp

    r36fa5fe rdddf956  
    1717 */ 
    1818 
    19 #include "i18n.hpp" 
    2019#include "features.hpp" 
     20 
     21#include "util/i18n.hpp" 
    2122 
    2223#include <libintl.h> 

  • src/util/resolv.cpp

    r36fa5fe rdddf956  
    1717 */ 
    1818 
    19 #include "resolv.hpp" 
     19#include "util/resolv.hpp" 
    2020 
    2121#include <glibmm/main.h> 

  • src/util/serialize.cpp

    r36fa5fe rdddf956  
    1717 */ 
    1818 
    19 #include "serialize.hpp" 
     19#include "util/serialize.hpp" 
    2020 
    2121const char* Gobby::serialize::type_name<int>::name = "int"; 

  • src/window.cpp

    re631cf1 rdddf956  
    1717 */ 
    1818 
     19#include "features.hpp" 
    1920#include "window.hpp" 
    20 #include "docwindow.hpp" 
    21 #include "icon.hpp" 
    22 #include "features.hpp" 
     21#include "core/docwindow.hpp" 
     22#include "core/iconmanager.hpp" 
    2323 
    2424#include <libinftextgtk/inf-text-gtk-buffer.h> 
    … …  
    6060        m_statusbar(m_folder), 
    6161        m_browser(*this, &TEXT_PLUGIN, m_statusbar, m_preferences), 
    62         m_commands_browser(m_browser, m_folder, m_statusbar, m_preferences) 
     62        m_commands_browser(m_browser, m_folder, m_statusbar, m_preferences), 
     63        m_commands_file(*this, m_header, m_browser, m_folder, m_statusbar) 
    6364{ 
    6465        m_header.show();