[haiku-commits] r41637 - haiku/trunk/src/preferences/appearance
- From: axeld@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 21 May 2011 20:10:46 +0200 (CEST)
Author: axeld
Date: 2011-05-21 20:10:44 +0200 (Sat, 21 May 2011)
New Revision: 41637
Changeset: https://dev.haiku-os.org/changeset/41637
Modified:
haiku/trunk/src/preferences/appearance/APRView.cpp
haiku/trunk/src/preferences/appearance/APRView.h
haiku/trunk/src/preferences/appearance/Jamfile
Log:
* Minor cleanup.
+alpha
Modified: haiku/trunk/src/preferences/appearance/APRView.cpp
===================================================================
--- haiku/trunk/src/preferences/appearance/APRView.cpp 2011-05-21 16:38:35 UTC
(rev 41636)
+++ haiku/trunk/src/preferences/appearance/APRView.cpp 2011-05-21 18:10:44 UTC
(rev 41637)
@@ -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.
*
* Authors:
@@ -7,8 +7,11 @@
* Rene Gollent (rene@xxxxxxxxxxx)
*/
+
#include "APRView.h"
+#include <stdio.h>
+
#include <Alert.h>
#include <Catalog.h>
#include <Directory.h>
@@ -20,11 +23,8 @@
#include <Path.h>
#include <SpaceLayoutItem.h>
-#include <private/interface/DecorInfo.h>
+#include <DecorInfo.h>
-#include <stdio.h>
-
-
#include "APRWindow.h"
#include "defs.h"
#include "ColorWell.h"
Modified: haiku/trunk/src/preferences/appearance/APRView.h
===================================================================
--- haiku/trunk/src/preferences/appearance/APRView.h 2011-05-21 16:38:35 UTC
(rev 41636)
+++ haiku/trunk/src/preferences/appearance/APRView.h 2011-05-21 18:10:44 UTC
(rev 41637)
@@ -9,36 +9,38 @@
#ifndef APR_VIEW_H_
#define APR_VIEW_H_
-#include <View.h>
+
+#include <Button.h>
#include <ColorControl.h>
-#include <Message.h>
#include <ListItem.h>
#include <ListView.h>
-#include <Button.h>
-#include <ScrollView.h>
-#include <ScrollBar.h>
-#include <String.h>
#include <Menu.h>
+#include <MenuBar.h>
#include <MenuField.h>
-#include <MenuBar.h>
#include <MenuItem.h>
+#include <Message.h>
+#include <ScrollBar.h>
+#include <ScrollView.h>
+#include <String.h>
#include <StringView.h>
-#include <Invoker.h>
+#include <View.h>
+#include <DecorInfo.h>
+
#include "ColorSet.h"
+
class ColorWell;
-class DecorInfoUtility;
class APRWindow;
-class APRView : public BView
-{
+
+class APRView : public BView {
public:
APRView(const char *name, uint32 flags);
~APRView(void);
void AttachedToWindow(void);
void MessageReceived(BMessage *msg);
-
+
void LoadSettings(void);
bool IsDefaultable(void);
@@ -47,21 +49,21 @@
void SetCurrentColor(rgb_color color);
void UpdateControls();
void UpdateAllColors();
-
+
BColorControl *fPicker;
-
+
BListView *fAttrList;
-
+
color_which fWhich;
-
+
BScrollView *fScrollView;
-
+
ColorWell *fColorWell;
ColorSet fCurrentSet;
ColorSet fPrevSet;
ColorSet fDefaultSet;
-
+
BMenu *fDecorMenu;
DecorInfoUtility*fDecorUtil;
};
Modified: haiku/trunk/src/preferences/appearance/Jamfile
===================================================================
--- haiku/trunk/src/preferences/appearance/Jamfile 2011-05-21 16:38:35 UTC
(rev 41636)
+++ haiku/trunk/src/preferences/appearance/Jamfile 2011-05-21 18:10:44 UTC
(rev 41637)
@@ -1,6 +1,6 @@
SubDir HAIKU_TOP src preferences appearance ;
-UsePrivateHeaders app [ FDirName servers app ] ;
+UsePrivateHeaders app interface [ FDirName servers app ] ;
UseFreeTypeHeaders ;
Preference Appearance :
@@ -11,17 +11,17 @@
ColorSet.cpp
ColorWell.cpp
ColorWhichItem.cpp
-
+
# These are currently disabled while everything else is being worked on
#CurView.cpp
#CursorWhichItem.cpp
#DecView.cpp
#SysCursorAPI.cpp
-
+
# These exist for post-R1, so they are disabled for now
#FontMenu.cpp
#MenuView.cpp
-
+
: be $(TARGET_LIBSTDC++) $(HAIKU_LOCALE_LIBS)
: Appearance.rdef
;
Other related posts:
- » [haiku-commits] r41637 - haiku/trunk/src/preferences/appearance - axeld
