Merge git://github.com/dkr/ananas-labs into dkr-validation

Conflicts:

	src/ananas/aminicalc.cpp
	src/ananas/aminicalc.h
	src/ananas/ananas.pro
	src/ananas/ananasmainform.cpp
	src/ananas/ananasmainform.h
	src/extensions/minicalc/aminicalc.cpp
	src/extensions/minicalc/aminicalc.h
	src/lib/aminicalc.cpp
	src/lib/aminicalc.h

Только разрезолвил конфликт объединения. Компилить не пробовал.

diff --cc src/ananas/ananas.pro
index daebe37,9888838..449f00e
--- 1/src/ananas/ananas.pro
--- 2/src/ananas/ananas.pro
+++ b/src/ananas/ananas.pro
@@@ -3,11 -3,9 +3,9 @@@ TARGET  = anana
  include ( ../ananas.pri )
  
  SOURCES       += main.cpp \
 -      ananasmainform.cpp
 -HEADERS       += ananasmainform.h
 +      ananasmainform.cpp 
 +HEADERS       += ananasmainform.h 
  
- 
- 
  #load(qsa)
  
  TRANSLATIONS = \

diff --cc src/ananas/ananasmainform.cpp
index dc7a1f0,34ddce4..d266da0
--- 1/src/ananas/ananasmainform.cpp
--- 2/src/ananas/ananasmainform.cpp
+++ b/src/ananas/ananasmainform.cpp
@@@ -40,6 -41,9 +41,7 @@@
  #include "ananasmainform.h"
  
  #include "ananas.h"
 -#include "aminicalc.h"
 -#include "ananas.h"
+ #include "binreloc.h"
  
  MainForm *mainform=NULL;
  QWorkspace *mainformws=NULL;
@@@ -123,17 -165,51 +163,31 @@@ voi
  MainForm::initMenuBar()
  {
        QPopupMenu *m;
 -      QPopupMenu *tools;
 -      QPopupMenu *p;
 -
        m = new QPopupMenu();
 -      tools = new QPopupMenu();
 -      lang = new QPopupMenu();
 -      lang->setCheckable( TRUE );
 -      // TODO!!! Check *qm files and complit list
 -
 -      //statusLabel3->setText(QString("%1\n").arg(QTextCodec::locale()));
 -      e_lang = lang->insertItem( tr("EN"), 0, 0);
 -      lang->setItemChecked( e_lang, true );
 -      r_lang = lang->insertItem(  tr("RU"), 1, 1);
 -      lang->setItemChecked( r_lang, false );
 -      u_lang = lang->insertItem( tr("UA"), 2, 2);
 -      lang->setItemChecked( u_lang, false );
 -
 -      connect(lang, SIGNAL(activated(int)), this, SLOT(setLang(int)));
 -
        windowsMenu = new QPopupMenu();
-       connect( windowsMenu, SIGNAL( aboutToShow() ),
+       connect( windowsMenu, SIGNAL( aboutToShow() ),
             this, SLOT( windowsMenuAboutToShow() ) );
+       systemMenu = new QPopupMenu();
+       systemMenu->insertItem( tr( "Login As..." ), this, SLOT( loginAs() ));
+       systemMenu->insertItem( "&Language Selector", lang );
+       systemMenu->insertSeparator();
+       systemMenu->insertItem(rcIcon("ananas-32x32.png"), tr( "Exit" ), qApp, SLOT( closeAllWindows() ), CTRL+Key_Q);
+ 
        m->insertItem(rcIcon("ananas-32x32.png"), tr( "About" ), this, SLOT( helpAbout() ), Key_F11);
 -      tools->insertItem(rcIcon("calc.png"), tr( "Calculator" ), this, SLOT( miniCalc() ), Key_F10);
 -      tools->insertItem(rcIcon("calendar.png"), tr( "Calendar" ), this, SLOT( ShowCalendar() ), Key_F12);
 +      m->insertItem(rcIcon("calc.png"), tr( "Calculator" ), this, SLOT( miniCalc() ), Key_F10);
        //windowsMenu->insertItem(rcIcon("ananas-32x32.png"), tr( "Windows" ), this, SLOT( windowsMenuAboutToShow() ));
          menubar = new AMenuBar( md, this, "menubar");
 -      InsertMainMenu( tr("&Tools"), tools );
        InsertMainMenu( tr("&Help"), m );
-       InsertMainMenu( tr("&Windows"), windowsMenu );
+       InsertMainMenu( tr("&Windows"), windowsMenu );
+       menuBar()->insertItem(tr("&System"),systemMenu,0,0);
        menuBar()->show();
+ 
+ }
+ 
+ void
+ MainForm::loginAs()
+ {
+       statusBar()->message( "Try again later...", 3000 );
  }
  
  void
@@@ -315,6 -528,17 +506,17 @@@ void MainForm::setLang( int lang_id 
  void
  MainForm::miniCalc()
  {
 -      MiniCalc *calc = new MiniCalc(ws, "MiniCalc", false, 0);
 -      calc->show();
 +      const QString code = "var calc= new Calc(); calc.Show();";
 +      engine.project.interpreter()->evaluate(code);
  }
+ 
+ /*
+  *  Open a Calendar
+  */
+ void
+ MainForm::ShowCalendar()
+ {
+       PopupCalendar *calendar = new PopupCalendar(QDate::currentDate(),
+               QPoint(ws->width() / 2, ws->height() / 2 ), ws, "");
+       calendar->show();
+ }

diff --cc src/ananas/ananasmainform.h
index d0fa8c5,adf8bda..5b7f3d6
--- 1/src/ananas/ananasmainform.h
--- 2/src/ananas/ananasmainform.h
+++ b/src/ananas/ananasmainform.h
@@@ -88,12 -104,18 +104,18 @@@ public slots
        void Exit(int code);
        void close();
        void helpAbout();
+       void miniCalc();
+       void ShowCalendar();
+       void statusMessage( const QString &msg, const int &pos );
        void statusMessage( const QString &msg );
+       void statusIcon( const int &status );
+ 
        void windowsMenuAboutToShow();
        void windowsMenuActivated( int id );
+       void setLang( int lang_id );
        void tileHorizontal();
        void setBackground( const QPixmap &pix );
 -      void loginAs();
 +      void miniCalc();
  
  protected:
        protected slots: