* Minor cleanup.
+alpha git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41637 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2002-2009, Haiku. All rights reserved.
|
* Copyright 2002-2011, Haiku. All rights reserved.
|
||||||
* Distributed under the terms of the MIT License.
|
* Distributed under the terms of the MIT License.
|
||||||
*
|
*
|
||||||
* Authors:
|
* Authors:
|
||||||
@@ -7,8 +7,11 @@
|
|||||||
* Rene Gollent ([email protected])
|
* Rene Gollent ([email protected])
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include "APRView.h"
|
#include "APRView.h"
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
|
||||||
#include <Alert.h>
|
#include <Alert.h>
|
||||||
#include <Catalog.h>
|
#include <Catalog.h>
|
||||||
#include <Directory.h>
|
#include <Directory.h>
|
||||||
@@ -20,10 +23,7 @@
|
|||||||
#include <Path.h>
|
#include <Path.h>
|
||||||
#include <SpaceLayoutItem.h>
|
#include <SpaceLayoutItem.h>
|
||||||
|
|
||||||
#include <private/interface/DecorInfo.h>
|
#include <DecorInfo.h>
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
|
|
||||||
|
|
||||||
#include "APRWindow.h"
|
#include "APRWindow.h"
|
||||||
#include "defs.h"
|
#include "defs.h"
|
||||||
|
|||||||
@@ -9,36 +9,38 @@
|
|||||||
#ifndef APR_VIEW_H_
|
#ifndef APR_VIEW_H_
|
||||||
#define APR_VIEW_H_
|
#define APR_VIEW_H_
|
||||||
|
|
||||||
#include <View.h>
|
|
||||||
|
#include <Button.h>
|
||||||
#include <ColorControl.h>
|
#include <ColorControl.h>
|
||||||
#include <Message.h>
|
|
||||||
#include <ListItem.h>
|
#include <ListItem.h>
|
||||||
#include <ListView.h>
|
#include <ListView.h>
|
||||||
#include <Button.h>
|
|
||||||
#include <ScrollView.h>
|
|
||||||
#include <ScrollBar.h>
|
|
||||||
#include <String.h>
|
|
||||||
#include <Menu.h>
|
#include <Menu.h>
|
||||||
#include <MenuField.h>
|
|
||||||
#include <MenuBar.h>
|
#include <MenuBar.h>
|
||||||
|
#include <MenuField.h>
|
||||||
#include <MenuItem.h>
|
#include <MenuItem.h>
|
||||||
|
#include <Message.h>
|
||||||
|
#include <ScrollBar.h>
|
||||||
|
#include <ScrollView.h>
|
||||||
|
#include <String.h>
|
||||||
#include <StringView.h>
|
#include <StringView.h>
|
||||||
#include <Invoker.h>
|
#include <View.h>
|
||||||
|
|
||||||
|
#include <DecorInfo.h>
|
||||||
|
|
||||||
#include "ColorSet.h"
|
#include "ColorSet.h"
|
||||||
|
|
||||||
|
|
||||||
class ColorWell;
|
class ColorWell;
|
||||||
class DecorInfoUtility;
|
|
||||||
class APRWindow;
|
class APRWindow;
|
||||||
|
|
||||||
class APRView : public BView
|
|
||||||
{
|
class APRView : public BView {
|
||||||
public:
|
public:
|
||||||
APRView(const char *name, uint32 flags);
|
APRView(const char *name, uint32 flags);
|
||||||
~APRView(void);
|
~APRView(void);
|
||||||
void AttachedToWindow(void);
|
void AttachedToWindow(void);
|
||||||
void MessageReceived(BMessage *msg);
|
void MessageReceived(BMessage *msg);
|
||||||
|
|
||||||
void LoadSettings(void);
|
void LoadSettings(void);
|
||||||
bool IsDefaultable(void);
|
bool IsDefaultable(void);
|
||||||
|
|
||||||
@@ -47,21 +49,21 @@ protected:
|
|||||||
void SetCurrentColor(rgb_color color);
|
void SetCurrentColor(rgb_color color);
|
||||||
void UpdateControls();
|
void UpdateControls();
|
||||||
void UpdateAllColors();
|
void UpdateAllColors();
|
||||||
|
|
||||||
BColorControl *fPicker;
|
BColorControl *fPicker;
|
||||||
|
|
||||||
BListView *fAttrList;
|
BListView *fAttrList;
|
||||||
|
|
||||||
color_which fWhich;
|
color_which fWhich;
|
||||||
|
|
||||||
BScrollView *fScrollView;
|
BScrollView *fScrollView;
|
||||||
|
|
||||||
ColorWell *fColorWell;
|
ColorWell *fColorWell;
|
||||||
|
|
||||||
ColorSet fCurrentSet;
|
ColorSet fCurrentSet;
|
||||||
ColorSet fPrevSet;
|
ColorSet fPrevSet;
|
||||||
ColorSet fDefaultSet;
|
ColorSet fDefaultSet;
|
||||||
|
|
||||||
BMenu *fDecorMenu;
|
BMenu *fDecorMenu;
|
||||||
DecorInfoUtility*fDecorUtil;
|
DecorInfoUtility*fDecorUtil;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
SubDir HAIKU_TOP src preferences appearance ;
|
SubDir HAIKU_TOP src preferences appearance ;
|
||||||
|
|
||||||
UsePrivateHeaders app [ FDirName servers app ] ;
|
UsePrivateHeaders app interface [ FDirName servers app ] ;
|
||||||
UseFreeTypeHeaders ;
|
UseFreeTypeHeaders ;
|
||||||
|
|
||||||
Preference Appearance :
|
Preference Appearance :
|
||||||
@@ -11,17 +11,17 @@ Preference Appearance :
|
|||||||
ColorSet.cpp
|
ColorSet.cpp
|
||||||
ColorWell.cpp
|
ColorWell.cpp
|
||||||
ColorWhichItem.cpp
|
ColorWhichItem.cpp
|
||||||
|
|
||||||
# These are currently disabled while everything else is being worked on
|
# These are currently disabled while everything else is being worked on
|
||||||
#CurView.cpp
|
#CurView.cpp
|
||||||
#CursorWhichItem.cpp
|
#CursorWhichItem.cpp
|
||||||
#DecView.cpp
|
#DecView.cpp
|
||||||
#SysCursorAPI.cpp
|
#SysCursorAPI.cpp
|
||||||
|
|
||||||
# These exist for post-R1, so they are disabled for now
|
# These exist for post-R1, so they are disabled for now
|
||||||
#FontMenu.cpp
|
#FontMenu.cpp
|
||||||
#MenuView.cpp
|
#MenuView.cpp
|
||||||
|
|
||||||
: be $(TARGET_LIBSTDC++) $(HAIKU_LOCALE_LIBS)
|
: be $(TARGET_LIBSTDC++) $(HAIKU_LOCALE_LIBS)
|
||||||
: Appearance.rdef
|
: Appearance.rdef
|
||||||
;
|
;
|
||||||
|
|||||||
Reference in New Issue
Block a user