# HG changeset patch # User ladanyi # Date 1168440976 0 # Node ID 013afe9ee040344a24a4a45715bcdcaefc4f6826 # Parent 38dc9e5936c4318f779cd2557f6421441d1e067e Removed this extra widget thing, because it is now developed in my private branch. diff -r 38dc9e5936c4 -r 013afe9ee040 Makefile.am --- a/Makefile.am Wed Jan 10 14:39:11 2007 +0000 +++ b/Makefile.am Wed Jan 10 14:56:16 2007 +0000 @@ -47,8 +47,6 @@ design_win.cc \ dijkstrabox.h \ dijkstrabox.cc \ - file_chooser_extra_widget.h \ - file_chooser_extra_widget.cc \ background_chooser_dialog.h \ background_chooser_dialog.cc diff -r 38dc9e5936c4 -r 013afe9ee040 file_chooser_extra_widget.cc --- a/file_chooser_extra_widget.cc Wed Jan 10 14:39:11 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ -/* -*- C++ -*- - * - * This file is a part of LEMON, a generic C++ optimization library - * - * Copyright (C) 2003-2006 - * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport - * (Egervary Research Group on Combinatorial Optimization, EGRES). - * - * Permission to use, modify and distribute this software is granted - * provided that this copyright notice appears in all copies. For - * precise terms see the accompanying LICENSE file. - * - * This software is provided "AS IS" with no warranty of any kind, - * express or implied, and with no claim as to its suitability for any - * purpose. - * - */ - -#include "file_chooser_extra_widget.h" -#include "mapstorage.h" - -FileChooserExtraWidget::FileChooserExtraWidget(MapStorage* ms) : - Gtk::Expander("_Options", true), - lblGUIData("Save GUI specific data to:"), - rbGUISection("_GUI section", true), - rbConfFile("s_eparate .conf file", true) -{ - std::cout << "FileChooserExtraWidget()" << std::endl; - - Gtk::RadioButtonGroup group = rbGUISection.get_group(); - rbConfFile.set_group(group); - - /* - switch (pMapStorage->getGUIDataSaveLocation()) - { - case GUI_SECTION: - break; - case CONF_FILE: - break; - } - */ - - add(box); - box.pack_start(lblGUIData, Gtk::PACK_SHRINK); - box.pack_start(rbGUISection, Gtk::PACK_SHRINK); - box.pack_start(rbConfFile, Gtk::PACK_SHRINK); - - rbConfFile.signal_group_changed().connect( - sigc::mem_fun(*this, &FileChooserExtraWidget::onRbToggled)); - rbGUISection.signal_group_changed().connect( - sigc::mem_fun(*this, &FileChooserExtraWidget::onRbToggled)); - - show_all_children(); -} - -void FileChooserExtraWidget::onRbToggled() -{ - std::cout << "onRbToggled()" << std::endl; -} - -FileChooserExtraWidget::~FileChooserExtraWidget() -{ - std::cout << "~FileChooserExtraWidget()" << std::endl; -} diff -r 38dc9e5936c4 -r 013afe9ee040 file_chooser_extra_widget.h --- a/file_chooser_extra_widget.h Wed Jan 10 14:39:11 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +0,0 @@ -/* -*- C++ -*- - * - * This file is a part of LEMON, a generic C++ optimization library - * - * Copyright (C) 2003-2006 - * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport - * (Egervary Research Group on Combinatorial Optimization, EGRES). - * - * Permission to use, modify and distribute this software is granted - * provided that this copyright notice appears in all copies. For - * precise terms see the accompanying LICENSE file. - * - * This software is provided "AS IS" with no warranty of any kind, - * express or implied, and with no claim as to its suitability for any - * purpose. - * - */ - -#ifndef FILE_CHOOSER_EXTRA_WIDGET -#define FILE_CHOOSER_EXTRA_WIDGET - -#include -#include -#include -#include - -class MapStorage; - -class FileChooserExtraWidget : public Gtk::Expander -{ - private: - Gtk::VBox box; - Gtk::Label lblGUIData; - Gtk::RadioButton rbGUISection; - Gtk::RadioButton rbConfFile; - MapStorage* pMapStorage; - void onRbToggled(); - public: - FileChooserExtraWidget(MapStorage* ms); - ~FileChooserExtraWidget(); -}; - -#endif diff -r 38dc9e5936c4 -r 013afe9ee040 nbtab.cc --- a/nbtab.cc Wed Jan 10 14:39:11 2007 +0000 +++ b/nbtab.cc Wed Jan 10 14:56:16 2007 +0000 @@ -17,7 +17,6 @@ */ #include -#include "file_chooser_extra_widget.h" NoteBookTab::NoteBookTab():mapwinexists(false), designwinexists(false), mapstorage(*this) { @@ -136,8 +135,6 @@ Gtk::FileChooserDialog fcdialog("Save File", Gtk::FILE_CHOOSER_ACTION_SAVE); fcdialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); fcdialog.add_button(Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT); - FileChooserExtraWidget w(&mapstorage); - fcdialog.set_extra_widget(w); if (fcdialog.run() == Gtk::RESPONSE_ACCEPT) { Glib::ustring filename = fcdialog.get_filename();