From 76477e1b46b5ca46ba6ddd42ad9a533c86c29e5d Mon Sep 17 00:00:00 2001
From: jacob1 <jfu614@gmail.com>
Date: Thu, 6 Sep 2012 11:33:30 -0400
Subject: Some improvements to the appearence of the save browser and preview

Make huge labels not so huge, fix color of some buttons

diff --git a/src/preview/PreviewView.cpp b/src/preview/PreviewView.cpp
index 0c5fa1f..0bc4ae0 100644
--- a/src/preview/PreviewView.cpp
+++ b/src/preview/PreviewView.cpp
@@ -60,23 +60,6 @@ PreviewView::PreviewView():
 	submitCommentButton(NULL),
 	commentBoxHeight(20)
 {
-	class OpenAction: public ui::ButtonAction
-	{
-		PreviewView * v;
-	public:
-		OpenAction(PreviewView * v_){ v = v_; }
-		virtual void ActionCallback(ui::Button * sender)
-		{
-			v->c->DoOpen();
-		}
-	};
-	openButton = new ui::Button(ui::Point(0, Size.Y-19), ui::Point(51, 19), "Open");
-	openButton->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;	openButton->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
-	openButton->SetIcon(IconOpen);
-	openButton->SetActionCallback(new OpenAction(this));
-	AddComponent(openButton);
-	SetOkayButton(openButton);
-
 	class FavAction: public ui::ButtonAction
 	{
 		PreviewView * v;
@@ -123,6 +106,23 @@ PreviewView::PreviewView():
 	reportButton->Enabled = Client::Ref().GetAuthUser().ID?true:false;
 	AddComponent(reportButton);
 
+	class OpenAction: public ui::ButtonAction
+	{
+		PreviewView * v;
+	public:
+		OpenAction(PreviewView * v_){ v = v_; }
+		virtual void ActionCallback(ui::Button * sender)
+		{
+			v->c->DoOpen();
+		}
+	};
+	openButton = new ui::Button(ui::Point(0, Size.Y-19), ui::Point(51, 19), "Open");
+	openButton->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;	openButton->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
+	openButton->SetIcon(IconOpen);
+	openButton->SetActionCallback(new OpenAction(this));
+	AddComponent(openButton);
+	SetOkayButton(openButton);
+
 	class BrowserOpenAction: public ui::ButtonAction
 	{
 		PreviewView * v;
diff --git a/src/search/SearchView.cpp b/src/search/SearchView.cpp
index 7834c93..04654d6 100644
--- a/src/search/SearchView.cpp
+++ b/src/search/SearchView.cpp
@@ -20,8 +20,8 @@ SearchView::SearchView():
 
 	nextButton = new ui::Button(ui::Point(XRES+BARSIZE-52, YRES+MENUSIZE-18), ui::Point(50, 16), "Next \x95");
 	previousButton = new ui::Button(ui::Point(1, YRES+MENUSIZE-18), ui::Point(50, 16), "\x96 Prev");
-	infoLabel  = new ui::Label(ui::Point(51, YRES+MENUSIZE-18), ui::Point(XRES+BARSIZE-102, 16), "Loading...");
-	tagsLabel  = new ui::Label(ui::Point(51, YRES+MENUSIZE-18), ui::Point(XRES+BARSIZE-102, 16), "\boPopular Tags:");
+	infoLabel  = new ui::Label(ui::Point(260, YRES+MENUSIZE-18), ui::Point(XRES+BARSIZE-520, 16), "Page 1 of 1");
+	tagsLabel  = new ui::Label(ui::Point(270, YRES+MENUSIZE-18), ui::Point(XRES+BARSIZE-540, 16), "\boPopular Tags:");
 	motdLabel  = new ui::RichLabel(ui::Point(51, YRES+MENUSIZE-18), ui::Point(XRES+BARSIZE-102, 16), Client::Ref().GetMessageOfTheDay());
 
 	class SearchAction : public ui::TextboxAction
@@ -91,6 +91,7 @@ SearchView::SearchView():
 	favButton->SetActionCallback(new FavAction(this));
 	favButton->Appearance.HorizontalAlign = ui::Appearance::AlignCentre;
 	favButton->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
+	favButton->Appearance.BorderInactive = ui::Colour(170,170,170);
 	AddComponent(favButton);
 	
 	class ClearSearchAction : public ui::ButtonAction
@@ -110,6 +111,7 @@ SearchView::SearchView():
 	clearSearchButton->Appearance.Margin.Top+=2;
 	clearSearchButton->Appearance.HorizontalAlign = ui::Appearance::AlignCentre;
 	clearSearchButton->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
+	clearSearchButton->Appearance.BorderInactive = ui::Colour(170,170,170);
 	AddComponent(clearSearchButton);
 
 	class NextPageAction : public ui::ButtonAction
--
cgit v0.9.2-21-gd62e