moved AdvancedSearchItem and AdvancedSearchEntry classes from Widgets to GLiveSupport

This commit is contained in:
fgerlits 2005-05-24 18:36:35 +00:00
parent c01fabbd1a
commit 12657e5aa7
8 changed files with 35 additions and 34 deletions

View file

@ -21,7 +21,7 @@
# #
# #
# Author : $Author: fgerlits $ # Author : $Author: fgerlits $
# Version : $Revision: 1.15 $ # Version : $Revision: 1.16 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/widgets/etc/Makefile.in,v $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/widgets/etc/Makefile.in,v $
# #
# @configure_input@ # @configure_input@
@ -120,9 +120,7 @@ WIDGETS_LIB_OBJS = ${TMP_DIR}/ImageButton.o \
${TMP_DIR}/ZebraTreeView.o \ ${TMP_DIR}/ZebraTreeView.o \
${TMP_DIR}/ZebraCellRenderer.o \ ${TMP_DIR}/ZebraCellRenderer.o \
${TMP_DIR}/Colors.o \ ${TMP_DIR}/Colors.o \
${TMP_DIR}/MessageWindow.o \ ${TMP_DIR}/MessageWindow.o
${TMP_DIR}/AdvancedSearchItem.o \
${TMP_DIR}/AdvancedSearchEntry.o
TEST_EXE_OBJS = ${TMP_DIR}/TestWindow.o \ TEST_EXE_OBJS = ${TMP_DIR}/TestWindow.o \
${TMP_DIR}/main.o ${TMP_DIR}/main.o

View file

@ -21,7 +21,7 @@
# #
# #
# Author : $Author: fgerlits $ # Author : $Author: fgerlits $
# Version : $Revision: 1.35 $ # Version : $Revision: 1.36 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/etc/Makefile.in,v $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/etc/Makefile.in,v $
# #
# @configure_input@ # @configure_input@
@ -192,6 +192,8 @@ G_LIVESUPPORT_OBJS = ${TMP_DIR}/GLiveSupport.o \
${TMP_DIR}/SchedulerWindow.o \ ${TMP_DIR}/SchedulerWindow.o \
${TMP_DIR}/SchedulePlaylistWindow.o \ ${TMP_DIR}/SchedulePlaylistWindow.o \
${TMP_DIR}/SearchWindow.o \ ${TMP_DIR}/SearchWindow.o \
${TMP_DIR}/AdvancedSearchEntry.o \
${TMP_DIR}/AdvancedSearchItem.o \
${TMP_DIR}/BrowseEntry.o \ ${TMP_DIR}/BrowseEntry.o \
${TMP_DIR}/BrowseItem.o \ ${TMP_DIR}/BrowseItem.o \
${TMP_DIR}/LiveModeWindow.o \ ${TMP_DIR}/LiveModeWindow.o \

View file

@ -22,8 +22,8 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.4 $ Version : $Revision: 1.1 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/widgets/src/Attic/AdvancedSearchEntry.cxx,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/AdvancedSearchEntry.cxx,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -35,13 +35,13 @@
#include <iostream> #include <iostream>
#include "LiveSupport/Widgets/AdvancedSearchItem.h" #include "AdvancedSearchItem.h"
#include "AdvancedSearchEntry.h"
#include "LiveSupport/Widgets/AdvancedSearchEntry.h"
using namespace LiveSupport::Core; using namespace LiveSupport::Core;
using namespace LiveSupport::Widgets; using namespace LiveSupport::Widgets;
using namespace LiveSupport::GLiveSupport;
/* =================================================== local data structures */ /* =================================================== local data structures */

View file

@ -22,12 +22,12 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.4 $ Version : $Revision: 1.1 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/widgets/include/LiveSupport/Widgets/Attic/AdvancedSearchEntry.h,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/AdvancedSearchEntry.h,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
#ifndef LiveSupport_Widgets_AdvancedSearchEntry_h #ifndef LiveSupport_GLiveSupport_AdvancedSearchEntry_h
#define LiveSupport_Widgets_AdvancedSearchEntry_h #define LiveSupport_GLiveSupport_AdvancedSearchEntry_h
#ifndef __cplusplus #ifndef __cplusplus
#error This is a C++ include file #error This is a C++ include file
@ -48,7 +48,7 @@
namespace LiveSupport { namespace LiveSupport {
namespace Widgets { namespace GLiveSupport {
using namespace LiveSupport::Core; using namespace LiveSupport::Core;
@ -64,7 +64,7 @@ using namespace LiveSupport::Core;
* A Gtk::VBox with one or more search input fields in it. * A Gtk::VBox with one or more search input fields in it.
* *
* @author $Author: fgerlits $ * @author $Author: fgerlits $
* @version $Revision: 1.4 $ * @version $Revision: 1.1 $
*/ */
class AdvancedSearchEntry : public Gtk::VBox, class AdvancedSearchEntry : public Gtk::VBox,
public LocalizedObject public LocalizedObject
@ -123,8 +123,8 @@ class AdvancedSearchEntry : public Gtk::VBox,
/* ====================================================== function prototypes */ /* ====================================================== function prototypes */
} // namespace Widgets } // namespace GLiveSupport
} // namespace LiveSupport } // namespace LiveSupport
#endif // LiveSupport_Widgets_AdvancedSearchEntry_h #endif // LiveSupport_GLiveSupport_AdvancedSearchEntry_h

View file

@ -22,8 +22,8 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.2 $ Version : $Revision: 1.1 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/widgets/src/Attic/AdvancedSearchItem.cxx,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/AdvancedSearchItem.cxx,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -37,11 +37,12 @@
#include "LiveSupport/Widgets/WidgetFactory.h" #include "LiveSupport/Widgets/WidgetFactory.h"
#include "LiveSupport/Widgets/AdvancedSearchItem.h" #include "AdvancedSearchItem.h"
using namespace LiveSupport::Core; using namespace LiveSupport::Core;
using namespace LiveSupport::Widgets; using namespace LiveSupport::Widgets;
using namespace LiveSupport::GLiveSupport;
/* =================================================== local data structures */ /* =================================================== local data structures */

View file

@ -23,11 +23,11 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.1 $ Version : $Revision: 1.1 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/widgets/include/LiveSupport/Widgets/Attic/AdvancedSearchItem.h,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/AdvancedSearchItem.h,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
#ifndef LiveSupport_Widgets_AdvancedSearchItem_h #ifndef LiveSupport_GLiveSupport_AdvancedSearchItem_h
#define LiveSupport_Widgets_AdvancedSearchItem_h #define LiveSupport_GLiveSupport_AdvancedSearchItem_h
#ifndef __cplusplus #ifndef __cplusplus
#error This is a C++ include file #error This is a C++ include file
@ -54,9 +54,10 @@
namespace LiveSupport { namespace LiveSupport {
namespace Widgets { namespace GLiveSupport {
using namespace LiveSupport::Core; using namespace LiveSupport::Core;
using namespace LiveSupport::Widgets;
/* ================================================================ constants */ /* ================================================================ constants */
@ -203,8 +204,8 @@ class AdvancedSearchItem : public Gtk::HBox,
/* ====================================================== function prototypes */ /* ====================================================== function prototypes */
} // namespace Widgets } // namespace GLiveSupport
} // namespace LiveSupport } // namespace LiveSupport
#endif // LiveSupport_Widgets_AdvancedSearchItem_h #endif // LiveSupport_GLiveSupport_AdvancedSearchItem_h

View file

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.14 $ Version : $Revision: 1.15 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/SearchWindow.cxx,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/SearchWindow.cxx,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -40,7 +40,6 @@
#include "LiveSupport/Widgets/WidgetFactory.h" #include "LiveSupport/Widgets/WidgetFactory.h"
#include "LiveSupport/Widgets/Notebook.h" #include "LiveSupport/Widgets/Notebook.h"
#include "LiveSupport/Widgets/Button.h" #include "LiveSupport/Widgets/Button.h"
#include "LiveSupport/Widgets/AdvancedSearchEntry.h"
#include "LiveSupport/Widgets/ZebraTreeView.h" #include "LiveSupport/Widgets/ZebraTreeView.h"
#include "SearchWindow.h" #include "SearchWindow.h"

View file

@ -22,7 +22,7 @@
Author : $Author: fgerlits $ Author : $Author: fgerlits $
Version : $Revision: 1.12 $ Version : $Revision: 1.13 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/SearchWindow.h,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/SearchWindow.h,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -50,9 +50,9 @@
#include "LiveSupport/Widgets/WhiteWindow.h" #include "LiveSupport/Widgets/WhiteWindow.h"
#include "LiveSupport/Widgets/Button.h" #include "LiveSupport/Widgets/Button.h"
#include "LiveSupport/Widgets/PlayableTreeModelColumnRecord.h" #include "LiveSupport/Widgets/PlayableTreeModelColumnRecord.h"
#include "LiveSupport/Widgets/AdvancedSearchEntry.h" #include "AdvancedSearchEntry.h"
#include "GLiveSupport.h"
#include "BrowseEntry.h" #include "BrowseEntry.h"
#include "GLiveSupport.h"
namespace LiveSupport { namespace LiveSupport {
@ -73,7 +73,7 @@ using namespace LiveSupport::Widgets;
* The Search/Browse window. * The Search/Browse window.
* *
* @author $Author: fgerlits $ * @author $Author: fgerlits $
* @version $Revision: 1.12 $ * @version $Revision: 1.13 $
*/ */
class SearchWindow : public WhiteWindow, public LocalizedObject class SearchWindow : public WhiteWindow, public LocalizedObject
{ {
@ -181,7 +181,7 @@ class SearchWindow : public WhiteWindow, public LocalizedObject
* Lists one clip per row. * Lists one clip per row.
* *
* @author $Author: fgerlits $ * @author $Author: fgerlits $
* @version $Revision: 1.12 $ * @version $Revision: 1.13 $
*/ */
class ModelColumns : public PlayableTreeModelColumnRecord class ModelColumns : public PlayableTreeModelColumnRecord
{ {