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

diff --git a/otk/otk_test.cc b/otk/otk_test.cc
index ccef19fa..f10c4b3b 100644
--- a/otk/otk_test.cc
+++ b/otk/otk_test.cc
@@ -1,108 +1,36 @@
-#include "focuswidget.hh"
-#include "button.hh"
-#include "display.hh"
-#include "configuration.hh"
-#include "timerqueuemanager.hh"
-#include "image.hh"
-#include "style.hh"
-#include <iostream>
-
-int main(void) {
-  otk::OBDisplay::initialize(NULL);
-  otk::Configuration style_conf(False);
-  otk::OBTimerQueueManager *tm = new otk::OBTimerQueueManager();
-  const otk::ScreenInfo *s_info =
-    otk::OBDisplay::screenInfo(DefaultScreen(otk::OBDisplay::display));
-  otk::BImageControl *ctrl = new otk::BImageControl(tm, s_info, True, 4, 5, 200);
-
-  otk::Style *my_style = new otk::Style(ctrl);
-
-  style_conf.setFile("/usr/local/share/openbox/styles/artwiz");
-  style_conf.load();
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
-  my_style->load(style_conf);
+#include "config.h"
 
-  otk::OtkFocusWidget foo(my_style);
-
-  foo.resize(600, 500);
-  foo.setTexture(my_style->getTitleFocus());
-  foo.setUnfocusTexture(my_style->getTitleUnfocus());
-
-  foo.setBevelWidth(2);
-  foo.setDirection(otk::OtkWidget::Horizontal);
-
-  otk::OtkFocusWidget left(&foo);
-  otk::OtkFocusWidget right(&foo);
+#include "application.hh"
+#include "appwidget.hh"
+#include "label.hh"
+#include "button.hh"
 
-  left.setDirection(otk::OtkWidget::Horizontal);
-  left.setStretchableVert(true);
-  left.setStretchableHorz(true);
-  left.setTexture(my_style->getTitleFocus());
-  left.setUnfocusTexture(my_style->getTitleUnfocus());
- 
-  right.setDirection(otk::OtkWidget::Vertical);
-  right.setBevelWidth(10);
-  right.setStretchableVert(true);
-  right.setWidth(300);
-  right.setTexture(my_style->getTitleFocus());
-  right.setUnfocusTexture(my_style->getTitleUnfocus());
+int main(int argc, char **argv) {
+  otk::Application app(argc, argv);
 
-  otk::OtkButton iconb(&left);
-  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();
-
-  // fix width to 60 and let the height be calculated by its parent
-  //label.setHeight(20);
-  label.setStretchableVert(true);
-  label.setStretchableHorz(true);
-  label.setTexture(my_style->getLabelFocus());
-  label.setUnfocusTexture(my_style->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(my_style->getHandleFocus());
-  rblef.setUnfocusTexture(my_style->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.update();
   foo.show();
 
-  while (1) {
-    if (XPending(otk::OBDisplay::display)) {
-      XEvent e;
-      XNextEvent(otk::OBDisplay::display, &e);
-      if (e.type == Expose) {
-        foo.expose(e.xexpose);
-      } else if (e.type == ConfigureNotify) {
-        foo.configure(e.xconfigure);
-      }
-    } 
-  }
-
-  delete my_style;
-  delete tm;
-  delete ctrl;
-
-  otk::OBDisplay::destroy();
+  app.run();
 
   return 0;
 }