From: Andrey Paskal <apaskal@gmail.com>
Date: Sat, 5 Jul 2008 09:09:03 +0000 (+0400)
Subject: Добился успешной компиляции.
X-Git-Url: https://gitweb.ananas.su/?a=commitdiff_plain;h=a0ab923ff4e3cfb08d91a712d5112d68d872fa3e;p=projects%2Fananas-labs.git

Добился успешной компиляции.
Пока без:
-интерактивной смены языка интерфейса
-вызова календаря из главного меню
---

diff --git a/src/ananas/ananasmainform.cpp b/src/ananas/ananasmainform.cpp
index d266da0..b404025 100644
--- a/src/ananas/ananasmainform.cpp
+++ b/src/ananas/ananasmainform.cpp
@@ -167,11 +167,6 @@ MainForm::initMenuBar()
 	windowsMenu = new QPopupMenu();
 	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);
 	m->insertItem(rcIcon("calc.png"), tr( "Calculator" ), this, SLOT( miniCalc() ), Key_F10);
@@ -179,18 +174,11 @@ MainForm::initMenuBar()
         menubar = new AMenuBar( md, this, "menubar");
 	InsertMainMenu( tr("&Help"), m );
 	InsertMainMenu( tr("&Windows"), windowsMenu );
-	menuBar()->insertItem(tr("&System"),systemMenu,0,0);
 	menuBar()->show();
 
 }
 
 void
-MainForm::loginAs()
-{
-	statusBar()->message( "Try again later...", 3000 );
-}
-
-void
 MainForm::initStatusBar()
 {
 }
@@ -442,63 +430,6 @@ void MainForm::windowsMenuActivated( int id )
     w->setFocus();
 }
 
-/*
- *  Language selector
- */
-void MainForm::setLang( int lang_id )
-{
-	QString langdir;
-	QString a_lang;
-	extern QTranslator tr_app;
-	extern QTranslator tr_lib;
-	extern QTranslator tr_plugins;
-	qApp->removeTranslator( &tr_app );
-	qApp->removeTranslator( &tr_lib );
-	qApp->removeTranslator( &tr_plugins );
-
-#ifdef _Windows
-	langdir = qApp->applicationDirPath()+"/translations/";
-#else
-	//langdir = QString("/usr/share/ananas/translations/");
-	langdir = QString(br_find_data_dir("/usr/share")) + QString("/ananas/translations/");
-#endif
-	if (lang_id == 0)
-	{
-		lang->setItemChecked( 0, true );
-		lang->setItemChecked( 1, false );
-		lang->setItemChecked( 2, false );
-		a_lang = "en";
-		statusLabel3->setText(QString("%1\n").arg(QTextCodec::locale()));
-	}
-	if (lang_id == 1)
-	{
-		lang->setItemChecked( 0, false );
-		lang->setItemChecked( 1, true );
-		lang->setItemChecked( 2, false );
-		a_lang = "ru";
-	}
-	if (lang_id == 2)
-	{
-		lang->setItemChecked( 0, false );
-		lang->setItemChecked( 1, false );
-		lang->setItemChecked( 2, true );
-		a_lang = "ua";
-	}
-
-	if (!tr_app.load("ananas-engine-"+a_lang.lower()+".qm", langdir)) printf("No tr_app.load\n");
-
-	if (!tr_lib.load("ananas-lib-"+a_lang.lower()+".qm", langdir)) printf("No tr_lib.load\n");
-
-	if (!tr_plugins.load("ananas-plugins-"+a_lang.lower()+".qm", langdir)) printf("No tr_plug.load\n");
-
-	qApp->installTranslator( &tr_app );
-	qApp->installTranslator( &tr_lib );
-	qApp->installTranslator( &tr_plugins );
-
-	languageChange();
-	statusLabel3->setText(a_lang.upper());
-	//statusBar()->message( QString(tr("Ananas"))+ QString(tr(" : %1")).arg(lang->text(lang_id)), 2000 );
-}
 
 /*
  *  Open a Calculator Widget
@@ -510,13 +441,3 @@ MainForm::miniCalc()
 	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 --git a/src/ananas/ananasmainform.h b/src/ananas/ananasmainform.h
index 5b7f3d6..2b55e82 100644
--- a/src/ananas/ananasmainform.h
+++ b/src/ananas/ananasmainform.h
@@ -38,11 +38,9 @@
 #include <qstringlist.h>
 #include <qworkspace.h>
 #include <qmainwindow.h>
-#include <qmessagebox.h>
 #include <qvbox.h>
 #include <qapplication.h>
 #include <qsettings.h>
-#include <qtranslator.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include "ananas.h"
@@ -50,8 +48,6 @@
 #include "atoolbar.h"
 #include "awindowslist.h"
 #include "engine.h"
-#include "aminicalc.h"
-#include "acalendar.h"
 
 class QVBoxLayout;
 class QHBoxLayout;
@@ -77,15 +73,10 @@ public:
 	aEngine engine;
 	aCfg *md;
 
-	int e_lang, r_lang, u_lang;
 	AMenuBar* menubar;
 	QPopupMenu *windowsMenu;
-	QPopupMenu *systemMenu;
-	QPopupMenu *lang;
 	QWorkspace* ws;
 	aWindowsList* wl;
-	MiniCalc* calc;
-	PopupCalendar* calendar;
 	QString rcfile;
 	QLabel *statusLabel1;
 	QLabel *statusLabel2;
@@ -104,15 +95,12 @@ 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 miniCalc();
diff --git a/src/lib/lib.pro b/src/lib/lib.pro
index 8ae2ed7..50bf8db 100644
--- a/src/lib/lib.pro
+++ b/src/lib/lib.pro
@@ -10,7 +10,6 @@ SOURCES	+= acfg.cpp \
 	acfgrc.cpp \
 	adatabase.cpp \
 	adatafield.cpp \
-	aminicalc.cpp \
 	asqlfield.cpp \
 	asqltable.cpp \
 	messageswindow.cpp \
@@ -56,7 +55,6 @@ HEADERS	+= ananasglobal.h \
 	acfgrc.h \
 	adatabase.h \
 	adatafield.h \
-	aminicalc.h \
 	asqlfield.h \
 	asqltable.h \
 	messageswindow.h \