X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fotk_test.cc;h=f10c4b3bb3651532af1788ea8050ee99828a3148;hb=0ebf6a17547f75c1fa961acbf3fdd59c0e494d22;hp=495b81d59ff687c425f3c7f748d9be517e936b83;hpb=1d897f432e54400cb2a0e1499712782b336fd728;p=chaz%2Fopenbox

diff --git a/otk/otk_test.cc b/otk/otk_test.cc
index 495b81d5..f10c4b3b 100644
--- a/otk/otk_test.cc
+++ b/otk/otk_test.cc
@@ -1,83 +1,36 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
-#ifdef HAVE_CONFIG_H
-# include "../config.h"
-#endif
+#include "config.h"
 
 #include "application.hh"
-#include "focuswidget.hh"
 #include "appwidget.hh"
+#include "label.hh"
 #include "button.hh"
 
 int main(int argc, char **argv) {
-  otk::OtkApplication app(argc, argv);
+  otk::Application app(argc, argv);
 
-  otk::OtkAppWidget foo(&app);
-
-  foo.resize(600, 500);
-  foo.setTexture(app.getStyle()->getTitleFocus());
-//  foo.setUnfocusTexture(app.getStyle()->getTitleUnfocus());
-
-  foo.setBevelWidth(2);
-  foo.setDirection(otk::OtkWidget::Horizontal);
-
-  otk::OtkFocusWidget left(&foo);
-  otk::OtkFocusWidget right(&foo);
-
-  left.setDirection(otk::OtkWidget::Horizontal);
-  left.setStretchableVert(true);
-  left.setStretchableHorz(true);
-  left.setTexture(app.getStyle()->getTitleFocus());
-  left.setUnfocusTexture(app.getStyle()->getTitleUnfocus());
- 
-  right.setDirection(otk::OtkWidget::Vertical);
-  right.setBevelWidth(10);
-  right.setStretchableVert(true);
-  right.setWidth(300);
-  right.setTexture(app.getStyle()->getTitleFocus());
-  right.setUnfocusTexture(app.getStyle()->getTitleUnfocus());
-
-  otk::OtkButton iconb(&left);
-  iconb.resize(40,20);
-  otk::OtkFocusWidget label(&left);
-  otk::OtkButton maxb(&left);
-  otk::OtkButton closeb(&left);
+  otk::AppWidget foo(&app, otk::Widget::Vertical, 3);
+  otk::Label lab(&foo);
+  otk::Label lab2(&foo);
+  otk::Button but(&foo);
+  otk::Button but2(&foo);
   
-  // fixed size
-  iconb.setText("foo");
-  iconb.press(Button1);
-
-  // fix width to 60 and let the height be calculated by its parent
-  //label.setHeight(20);
-  label.setStretchableVert(true);
-  label.setStretchableHorz(true);
-  label.setTexture(app.getStyle()->getLabelFocus());
-  label.setUnfocusTexture(app.getStyle()->getLabelUnfocus());
-
-  // fixed size
-  maxb.setText("bar");
-
-  // fixed size
-  closeb.setText("fuubar");
-
-  otk::OtkFocusWidget rblef(&right);
-  otk::OtkButton rbutt1(&right);
-  otk::OtkButton rbutt2(&right);
-
-  rblef.setStretchableHorz(true);
-  rblef.setHeight(50);
-  rblef.setTexture(app.getStyle()->getHandleFocus());
-  rblef.setUnfocusTexture(app.getStyle()->getHandleUnfocus());
+  foo.resize(otk::Size(100, 150));
+
+  lab.setText("Hi, I'm a sexy\nlabel!!!");
+  lab.setMaxSize(otk::Size(0,0));
+  lab2.setText("Me too!!");
+  lab2.setBorderWidth(10);
+  lab2.setBorderColor(otk::RenderStyle::style(app.screen())->buttonFocusColor());
+  but.setText("Im not the default button...");
+  but2.setText("But I AM!!");
+  but2.setHighlighted(true);
   
-  rbutt1.setText("this is fucking tight");
-  rbutt2.setText("heh, WOOP");
-
-  // will recursively unfocus its children
-  //foo.unfocus();
 
   foo.show();
 
-  app.exec();
+  app.run();
 
   return 0;
 }