ui fixes
This commit is contained in:
parent
2e82ca6791
commit
720dcbb381
3 changed files with 69 additions and 71 deletions
BIN
DumBer
BIN
DumBer
Binary file not shown.
|
@ -3,7 +3,6 @@
|
||||||
* All rights reserved. Distributed under the terms of the MIT license.
|
* All rights reserved. Distributed under the terms of the MIT license.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include "MainWindow.h"
|
#include "MainWindow.h"
|
||||||
|
|
||||||
#include <Url.h>
|
#include <Url.h>
|
||||||
|
@ -14,6 +13,7 @@
|
||||||
#include <LayoutBuilder.h>
|
#include <LayoutBuilder.h>
|
||||||
#include <Menu.h>
|
#include <Menu.h>
|
||||||
#include <MenuBar.h>
|
#include <MenuBar.h>
|
||||||
|
#include <ScrollView.h>
|
||||||
#include <StringView.h>
|
#include <StringView.h>
|
||||||
|
|
||||||
#include <View.h>
|
#include <View.h>
|
||||||
|
@ -38,24 +38,19 @@ MainWindow::MainWindow()
|
||||||
: BWindow(BRect(100, 100, 600, 400), B_TRANSLATE("BeDumb"), B_TITLED_WINDOW,
|
: BWindow(BRect(100, 100, 600, 400), B_TRANSLATE("BeDumb"), B_TITLED_WINDOW,
|
||||||
B_ASYNCHRONOUS_CONTROLS | B_QUIT_ON_WINDOW_CLOSE) {
|
B_ASYNCHRONOUS_CONTROLS | B_QUIT_ON_WINDOW_CLOSE) {
|
||||||
|
|
||||||
|
|
||||||
BMenuBar *menuBar = _BuildMenu();
|
BMenuBar *menuBar = _BuildMenu();
|
||||||
|
|
||||||
BLayoutBuilder::Group<>(this, B_VERTICAL, 0).Add(menuBar).AddGlue().End();
|
BLayoutBuilder::Group<>(this, B_VERTICAL, 0).Add(menuBar).AddGlue().End();
|
||||||
|
|
||||||
_inputField =
|
_inputField = new BTextControl("", "What is the matrix ?",
|
||||||
new BTextControl("", "What is the matrix ?", new BMessage(kQuestionChanged));
|
new BMessage(kQuestionChanged));
|
||||||
|
|
||||||
|
|
||||||
_progress = new BStatusBar("prog");
|
_progress = new BStatusBar("prog");
|
||||||
_progress->SetMaxValue(100);
|
_progress->SetMaxValue(100);
|
||||||
_progress->SetTo(0);
|
_progress->SetTo(0);
|
||||||
_progress->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
|
_progress->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
|
||||||
|
|
||||||
|
BStringView *header = new BStringView("biglabel", "Let's Be Dumber!");
|
||||||
_answerView = new BTextView("answer");
|
|
||||||
|
|
||||||
BStringView* header = new BStringView("biglabel", "Let's Be Dumber!");
|
|
||||||
BFont font;
|
BFont font;
|
||||||
header->GetFont(&font);
|
header->GetFont(&font);
|
||||||
font.SetSize(20);
|
font.SetSize(20);
|
||||||
|
@ -81,9 +76,20 @@ MainWindow::MainWindow()
|
||||||
new BButton("send", B_TRANSLATE("Send"), new BMessage(kSendPrompt),
|
new BButton("send", B_TRANSLATE("Send"), new BMessage(kSendPrompt),
|
||||||
B_WILL_DRAW | B_NAVIGABLE);
|
B_WILL_DRAW | B_NAVIGABLE);
|
||||||
|
|
||||||
|
_answerView = new BTextView("answer", B_WILL_DRAW | B_FOLLOW_ALL);
|
||||||
|
_answerView->MakeEditable(false); // Disable editing
|
||||||
|
_answerView->MakeSelectable(true); // Enable text selection
|
||||||
|
|
||||||
|
//_answerView->SetWordWrap(true);
|
||||||
|
BScrollView *scrollView =
|
||||||
|
new BScrollView("scroll_view", _answerView, 0, 0, false,
|
||||||
|
true); // horizontal and vertical scrollbars
|
||||||
|
|
||||||
BLayoutBuilder::Group<>(this, B_VERTICAL, 0)
|
BLayoutBuilder::Group<>(this, B_VERTICAL, 0)
|
||||||
|
|
||||||
|
.AddGlue(0.1)
|
||||||
.Add(header)
|
.Add(header)
|
||||||
|
.AddGlue(0.1)
|
||||||
|
|
||||||
.AddGroup(B_HORIZONTAL, 0, 1)
|
.AddGroup(B_HORIZONTAL, 0, 1)
|
||||||
.Add(_inputField)
|
.Add(_inputField)
|
||||||
|
@ -92,9 +98,10 @@ MainWindow::MainWindow()
|
||||||
.End()
|
.End()
|
||||||
.End()
|
.End()
|
||||||
|
|
||||||
|
.AddGlue(0.1)
|
||||||
|
.Add(scrollView)
|
||||||
.Add(_progress)
|
.Add(_progress)
|
||||||
.Add(_infoView)
|
.Add(_infoView)
|
||||||
.Add(_answerView)
|
|
||||||
|
|
||||||
.SetInsets(5, 5, 5, 5)
|
.SetInsets(5, 5, 5, 5)
|
||||||
|
|
||||||
|
@ -125,7 +132,7 @@ void MainWindow::MessageReceived(BMessage *message) {
|
||||||
printf("Question Changed\n");
|
printf("Question Changed\n");
|
||||||
_progress->SetTo(2);
|
_progress->SetTo(2);
|
||||||
|
|
||||||
// sendQuery();
|
// sendQuery();
|
||||||
|
|
||||||
} break;
|
} break;
|
||||||
|
|
||||||
|
@ -165,8 +172,6 @@ void MainWindow::MessageReceived(BMessage *message) {
|
||||||
_infoView->SetText("HttpRedirect...");
|
_infoView->SetText("HttpRedirect...");
|
||||||
} break;
|
} break;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
case UrlEvent::RequestCompleted: {
|
case UrlEvent::RequestCompleted: {
|
||||||
printf("RequestCompleted\n");
|
printf("RequestCompleted\n");
|
||||||
auto identifier = message->GetInt32(UrlEventData::Id, -1);
|
auto identifier = message->GetInt32(UrlEventData::Id, -1);
|
||||||
|
@ -186,7 +191,6 @@ void MainWindow::MessageReceived(BMessage *message) {
|
||||||
|
|
||||||
} break;
|
} break;
|
||||||
|
|
||||||
|
|
||||||
case UrlEvent::HttpStatus: {
|
case UrlEvent::HttpStatus: {
|
||||||
|
|
||||||
printf("HttpStatus\n");
|
printf("HttpStatus\n");
|
||||||
|
@ -217,21 +221,17 @@ void MainWindow::MessageReceived(BMessage *message) {
|
||||||
}
|
}
|
||||||
} break;
|
} break;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
default: {
|
default: {
|
||||||
//message->PrintToStream();
|
// message->PrintToStream();
|
||||||
BWindow::MessageReceived(message); // call the parent handler for other messages
|
BWindow::MessageReceived(
|
||||||
|
message); // call the parent handler for other messages
|
||||||
// _infoView->SetText(message->FindMessage());
|
// _infoView->SetText(message->FindMessage());
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
} // end switch
|
||||||
|
|
||||||
}//end switch
|
} // end function
|
||||||
|
|
||||||
} //end function
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void MainWindow::sendQuery() {
|
void MainWindow::sendQuery() {
|
||||||
|
|
||||||
|
@ -241,7 +241,7 @@ void MainWindow::sendQuery() {
|
||||||
_progress->SetMaxValue(100);
|
_progress->SetMaxValue(100);
|
||||||
_progress->SetTo(0);
|
_progress->SetTo(0);
|
||||||
|
|
||||||
auto url = BUrl("https://www.link-u.com/ip/");
|
auto url = BUrl("https://www.lema.org/");
|
||||||
BHttpRequest request = BHttpRequest(url);
|
BHttpRequest request = BHttpRequest(url);
|
||||||
|
|
||||||
printf("Sending Prompt to server: %s\n", url.UrlString().String());
|
printf("Sending Prompt to server: %s\n", url.UrlString().String());
|
||||||
|
@ -250,11 +250,8 @@ void MainWindow::sendQuery() {
|
||||||
if (_lastResult) {
|
if (_lastResult) {
|
||||||
printf("Result has identity: %d\n", _lastResult->Identity());
|
printf("Result has identity: %d\n", _lastResult->Identity());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
BMenuBar *MainWindow::_BuildMenu() {
|
BMenuBar *MainWindow::_BuildMenu() {
|
||||||
|
|
||||||
BMenuBar *menuBar = new BMenuBar("menubar");
|
BMenuBar *menuBar = new BMenuBar("menubar");
|
||||||
|
@ -283,11 +280,11 @@ BMenuBar *MainWindow::_BuildMenu() {
|
||||||
item->SetTarget(be_app);
|
item->SetTarget(be_app);
|
||||||
menu->AddItem(item);
|
menu->AddItem(item);
|
||||||
|
|
||||||
item = new BMenuItem(B_TRANSLATE("Quit"), new BMessage(B_QUIT_REQUESTED), 'Q');
|
item =
|
||||||
|
new BMenuItem(B_TRANSLATE("Quit"), new BMessage(B_QUIT_REQUESTED), 'Q');
|
||||||
menu->AddItem(item);
|
menu->AddItem(item);
|
||||||
|
|
||||||
menuBar->AddItem(menu);
|
menuBar->AddItem(menu);
|
||||||
|
|
||||||
return menuBar;
|
return menuBar;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -55,6 +55,7 @@ private:
|
||||||
BTextView * _infoView;
|
BTextView * _infoView;
|
||||||
BTextControl* _inputField;
|
BTextControl* _inputField;
|
||||||
BStatusBar* _progress;
|
BStatusBar* _progress;
|
||||||
|
|
||||||
BMenuItem *fSaveMenuItem;
|
BMenuItem *fSaveMenuItem;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue