reordered commands/functions

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@4269 17fca916-40b9-46aa-a4ea-0a15b648b75c

3 files changed, 65 insertions, 45 deletions

diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp
index abba99dcc..006dd5767 100644
--- a/src/kvirc/ui/kvi_input.cpp
+++ b/src/kvirc/ui/kvi_input.cpp
@@ -42,6 +42,7 @@
 #include "kvi_userinput.h"
 #include "kvi_tal_popupmenu.h"
 #include "kvi_tal_hbox.h"
+#include "kvi_tal_vbox.h"
 #include "kvi_tal_tooltip.h"
 
 #include <QLabel>
@@ -56,7 +57,8 @@
 #include <QEvent>
 #include <QMouseEvent>
 #include <QUrl>
-#include <QHBoxLayout>
+//#include <QHBoxLayout>
+//#include <QSplitter>
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -71,40 +73,41 @@ KviInput::KviInput(KviWindow * pPar, KviUserListView * pView)
 : QWidget(pPar)
 {
 	setObjectName("input_widget");
-	m_pLayout=new QGridLayout(this);
-
+	
+	m_pLayout = new QGridLayout(this);
 	m_pLayout->setMargin(0);
 	m_pLayout->setSpacing(0);
 
 	m_pWindow = pPar;
 	m_pMultiLineEditor = 0;
+	//m_pSplitter = 0;
 
 	m_pHideToolsButton = new QToolButton(this);
 	m_pHideToolsButton->setObjectName("hide_container_button");
-
 	m_pHideToolsButton->setIconSize(QSize(22,22));
 	m_pHideToolsButton->setFixedWidth(16);
 
 	if(g_pIconManager->getBigIcon("kvi_horizontal_left.png"))
+	{
 		m_pHideToolsButton->setIcon(QIcon(*(g_pIconManager->getBigIcon("kvi_horizontal_left.png"))));
+	}
 
 	connect(m_pHideToolsButton,SIGNAL(clicked()),this,SLOT(toggleToolButtons()));
 
 	m_pButtonContainer = new KviTalHBox(this);
 	m_pButtonContainer->setSpacing(0);
 	m_pButtonContainer->setMargin(0);
-
 	m_pButtonContainer->setSizePolicy(QSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum));
 	//if(m_pButtonContainer->layout())
 	// m_pButtonContainer->layout()->setSizeConstraint(QLayout::SetMinimumSize);
 
 	m_pHistoryButton = new QToolButton(m_pButtonContainer);
 	m_pHistoryButton->setObjectName("historybutton");
-
 	m_pHistoryButton->setIconSize(QSize(22,22));
 	//m_pHistoryButton->setUpdatesEnabled(TRUE); ???
+	
 	QIcon is1;
-	if(KVI_OPTION_BOOL(KviOption_boolEnableInputHistory))//G&N mar 2005
+	if(KVI_OPTION_BOOL(KviOption_boolEnableInputHistory))
 	{
 		is1.addPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)));
 		m_pHistoryButton->setIcon(is1);
@@ -118,8 +121,8 @@ KviInput::KviInput(KviWindow * pPar, KviUserListView * pView)
 
 	m_pIconButton = new QToolButton(m_pButtonContainer);
 	m_pIconButton->setObjectName("iconbutton");
-
 	m_pIconButton->setIconSize(QSize(22,22));
+	
 	QIcon is3;
 	is3.addPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_BIGGRIN)));
 	m_pIconButton->setIcon(is3);
@@ -128,36 +131,35 @@ KviInput::KviInput(KviWindow * pPar, KviUserListView * pView)
 
 	m_pCommandlineModeButton = new QToolButton(m_pButtonContainer);
 	m_pCommandlineModeButton->setObjectName("commandlinemodebutton");
-
 	m_pCommandlineModeButton->setIconSize(QSize(22,22));
 	m_pCommandlineModeButton->setCheckable(true);
+	
 	QIcon is0;
 	is0.addPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SAYSMILE)),QIcon::Normal,QIcon::On);
 	is0.addPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SAYKVS)),QIcon::Normal,QIcon::Off);
 	m_pCommandlineModeButton->setIcon(is0);
 	KviTalToolTip::add(m_pCommandlineModeButton,__tr2qs("User friendly commandline mode<br>See also /help commandline"));
+	
 	if(KVI_OPTION_BOOL(KviOption_boolCommandlineInUserFriendlyModeByDefault))
 		m_pCommandlineModeButton->setChecked(true);
 
 
 	m_pMultiEditorButton = new QToolButton(m_pButtonContainer);
 	m_pMultiEditorButton->setObjectName("multieditorbutton");
-
 	m_pMultiEditorButton->setCheckable(true);
 	m_pMultiEditorButton->setIconSize(QSize(22,22));
+	
 	QIcon is2;
 	is2.addPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TERMINAL)),QIcon::Normal,QIcon::On);
 	is2.addPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TERMINAL)),QIcon::Normal,QIcon::Off);
 	m_pMultiEditorButton->setIcon(is2);
 	QString szTip = __tr2qs("Multi-line Editor<br>&lt;Alt+Return&gt;");
 	KviTalToolTip::add(m_pMultiEditorButton,szTip);
-
 	connect(m_pMultiEditorButton,SIGNAL(toggled(bool)),this,SLOT(multilineEditorButtonToggled(bool)));
 
 	m_pInputEditor = new KviInputEditor(this,pPar,pView);
-	connect(m_pInputEditor,SIGNAL(enterPressed()),this,SLOT(inputEditorEnterPressed()));
 	m_pInputEditor->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Ignored));
-
+	connect(m_pInputEditor,SIGNAL(enterPressed()),this,SLOT(inputEditorEnterPressed()));
 
 	m_pMultiEditorButton->setAutoRaise(true);
 	m_pCommandlineModeButton->setAutoRaise(true);
@@ -185,10 +187,12 @@ void KviInput::setButtonsHidden(bool bHidden)
 {
 	if(!m_pHideToolsButton || !m_pButtonContainer)
 		return;
-	if(bHidden==m_pButtonContainer->isHidden())
+	
+	if(bHidden == m_pButtonContainer->isHidden())
 		return;
+	
 	m_pButtonContainer->setHidden(bHidden);
-	QPixmap * pix= bHidden ?
+	QPixmap * pix = bHidden ?
 		g_pIconManager->getBigIcon("kvi_horizontal_right.png") :
 		g_pIconManager->getBigIcon("kvi_horizontal_left.png");
 	if(pix)
@@ -207,9 +211,9 @@ void KviInput::inputEditorEnterPressed()
 	m_pInputEditor->setText("");
 }
 
-void KviInput::keyPressEvent(QKeyEvent *e)
+void KviInput::keyPressEvent(QKeyEvent * e)
 {
-	//debug("KviInput::keyPressEvent(key:%d,state:%d,text:%s)",e->key(),e->state(),e->text().isEmpty() ? "empty" : e->text().toUtf8().data());
+	debug("KviInput::keyPressEvent(key:%d,text:%s)",e->key(),e->text().isEmpty() ? "empty" : e->text().toUtf8().data());
 
 	if(e->modifiers() & Qt::AltModifier)
 	{
@@ -307,7 +311,9 @@ void KviInput::multilineEditorButtonToggled(bool bOn)
 		m_pMultiLineEditor = 0;
 
 		delete m_pHelpLabel;
+		//delete m_pSplitter;
 		m_pHelpLabel = 0;
+		//m_pSplitter = 0;
 
 		szTmp.replace(QRegExp("[\a\f\n\r\v]"), QString(" "));
 		szTmp.replace('\t',QString(KVI_OPTION_UINT(KviOption_uintSpacesToExpandTabulationInput),' ')); //expand tabs to spaces
@@ -320,14 +326,25 @@ void KviInput::multilineEditorButtonToggled(bool bOn)
 		if(!bOn) return;
 		m_pInputEditor->hide();
 
-		m_pHelpLabel = new QLabel();
+		//m_pSplitter = new QSplitter(Qt::Vertical,this);
+		//m_pSplitter->setObjectName("multiline_splitter");
+		//m_pLayout->addWidget(m_pSplitter,0,0,1,1);
+		//m_pLayout->addWidget(m_pSplitter,0,0);
+
+		KviTalVBox * pBox = new KviTalVBox(this);
+		//KviTalVBox * pBox = new KviTalVBox(m_pSplitter);
+		
+		m_pHelpLabel = new QLabel(pBox);
 		m_pHelpLabel->setIndent(5); // we only want a left margin here
 		m_pHelpLabel->setText(__tr2qs("<Ctrl+Return>; submits, <Alt+Return>; hides this editor"));
 		m_pLayout->addWidget(m_pHelpLabel,0,0,1,1);
+		//m_pSplitter->addWidget(m_pHelpLabel);
 
-		m_pMultiLineEditor = KviScriptEditor::createInstance(this);
+		m_pMultiLineEditor = KviScriptEditor::createInstance(pBox);
 		m_pMultiLineEditor->setText(m_pInputEditor->text());
 		m_pLayout->addWidget(m_pMultiLineEditor,1,0,1,1);
+		//m_pSplitter->addWidget(m_pMultiLineEditor);
+		//m_pSplitter->addWidget(pBox);
 
 		m_pWindow->childrenTreeChanged(m_pMultiLineEditor);
 		m_pMultiLineEditor->setFocus();
@@ -354,9 +371,9 @@ void KviInput::historyButtonClicked()
 	g_pHistoryWindow->popup(this);
 }
 
-#define BUTTON_WIDTH 20
+/*#define BUTTON_WIDTH 20
 
-/*void KviInput::resizeEvent(QResizeEvent *e)
+void KviInput::resizeEvent(QResizeEvent *e)
 {
 	//m_pButtonContainer
 	m_pInputEditor->setGeometry(0,0,m_pButtonContainer->isVisible() ? width() - (BUTTON_WIDTH * 4)-10 : width() - 10,height());
@@ -384,7 +401,7 @@ void KviInput::focusInEvent(QFocusEvent *)
 
 int KviInput::heightHint() const
 {
-	return m_pMultiLineEditor ? 120 : m_pInputEditor->heightHint();
+	return m_pMultiLineEditor ? 150 : m_pInputEditor->heightHint();
 }
 
 void KviInput::setText(const QString & szText)
@@ -423,12 +440,12 @@ void KviInput::applyOptions()
 
 	m_pInputEditor->applyOptions();
 }
-
+#if 0
 void KviInput::setFocusProxy(QWidget *)
 {
 	/* do nothing */
 }
-
+#endif
 QString KviInput::text()
 {
 	QString szText;
diff --git a/src/kvirc/ui/kvi_input.h b/src/kvirc/ui/kvi_input.h
index 5776bfb0d..34d44c9f9 100644
--- a/src/kvirc/ui/kvi_input.h
+++ b/src/kvirc/ui/kvi_input.h
@@ -39,6 +39,8 @@
 #include <QLabel>
 
 class QGridLayout;
+//class QSplitter;
+
 class KviUserListView;
 class KviWindow;
 class KviInputEditor;
@@ -76,8 +78,10 @@ public:
 	QToolButton     * m_pIconButton;
 	QToolButton     * m_pCommandlineModeButton;
 	QToolButton     * m_pHideToolsButton;
+protected:
 	QGridLayout     * m_pLayout;
 	QLabel          * m_pHelpLabel;
+	//QSplitter       * m_pSplitter;
 public:
 	/**
 	* \brief Sets the focus to the input line
@@ -96,14 +100,14 @@ public:
 	* \brief Returns true if the input line is in user-friendly mode
 	* \return bool
 	*/
-	bool isUserFriendly() { return m_pCommandlineModeButton->isChecked(); };
+	bool isUserFriendly(){ return m_pCommandlineModeButton->isChecked(); };
 
 	/**
 	* \brief Sets the user-friendly mode to the input line
 	* \param bSet Whether to set the user-friendly mode
 	* \return void
 	*/
-	void setUserFriendly(bool bSet) { m_pCommandlineModeButton->setChecked(bSet); };
+	void setUserFriendly(bool bSet){ m_pCommandlineModeButton->setChecked(bSet); };
 
 	/**
 	* \brief Returns the height of the input line
@@ -156,7 +160,6 @@ public:
 	* \return QString
 	*/
 	QString text();
-	//const QString & text();
 
 	/**
 	* \brief Return the instance of the input editor
@@ -203,7 +206,7 @@ public slots:
 protected:
 	//virtual void resizeEvent(QResizeEvent * e);
 	virtual void focusInEvent(QFocusEvent * e);
-	virtual void setFocusProxy(QWidget * w);
+	//virtual void setFocusProxy(QWidget * w);
 	virtual void keyPressEvent(QKeyEvent * e);
 };
 
diff --git a/src/modules/file/libkvifile.cpp b/src/modules/file/libkvifile.cpp
index 510f86496..8636ebfa2 100644
--- a/src/modules/file/libkvifile.cpp
+++ b/src/modules/file/libkvifile.cpp
@@ -1343,34 +1343,33 @@ static bool file_kvs_fnc_digest(KviKvsModuleFunctionCall * c)
 
 static bool file_module_init(KviModule * m)
 {
-
+	KVSM_REGISTER_SIMPLE_COMMAND(m,"addimagepath",file_kvs_cmd_addimagepath);
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"copy",file_kvs_cmd_copy);
-	KVSM_REGISTER_SIMPLE_COMMAND(m,"rename",file_kvs_cmd_rename);
+	KVSM_REGISTER_SIMPLE_COMMAND(m,"delimagepath",file_kvs_cmd_delimagepath);
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"mkdir",file_kvs_cmd_mkdir);
-	KVSM_REGISTER_SIMPLE_COMMAND(m,"write",file_kvs_cmd_write);
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"remove",file_kvs_cmd_remove);
+	KVSM_REGISTER_SIMPLE_COMMAND(m,"rename",file_kvs_cmd_rename);
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"rmdir",file_kvs_cmd_rmdir);
-	KVSM_REGISTER_SIMPLE_COMMAND(m,"addimagepath",file_kvs_cmd_addimagepath);
-	KVSM_REGISTER_SIMPLE_COMMAND(m,"delimagepath",file_kvs_cmd_delimagepath);
+	KVSM_REGISTER_SIMPLE_COMMAND(m,"write",file_kvs_cmd_write);
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"writeLines",file_kvs_cmd_writeLines);
 
+	KVSM_REGISTER_FUNCTION(m,"allsizes",file_kvs_fnc_allSizes);
+	KVSM_REGISTER_FUNCTION(m,"cwd",file_kvs_fnc_cwd);
 	KVSM_REGISTER_FUNCTION(m,"digest",file_kvs_fnc_digest);
 	KVSM_REGISTER_FUNCTION(m,"exists",file_kvs_fnc_exists);
-	KVSM_REGISTER_FUNCTION(m,"type",file_kvs_fnc_type);
-	KVSM_REGISTER_FUNCTION(m,"size",file_kvs_fnc_size);
-	KVSM_REGISTER_FUNCTION(m,"allsizes",file_kvs_fnc_allSizes);
+	KVSM_REGISTER_FUNCTION(m,"extractfilename",file_kvs_fnc_extractfilename);
+	KVSM_REGISTER_FUNCTION(m,"extractpath",file_kvs_fnc_extractpath);
 	KVSM_REGISTER_FUNCTION(m,"fixpath",file_kvs_fnc_fixpath);
-	KVSM_REGISTER_FUNCTION(m,"ps",file_kvs_fnc_ps);
-	KVSM_REGISTER_FUNCTION(m,"read",file_kvs_fnc_read);
-	KVSM_REGISTER_FUNCTION(m,"localdir",file_kvs_fnc_localdir);
-	KVSM_REGISTER_FUNCTION(m,"homedir",file_kvs_fnc_homedir);
-	KVSM_REGISTER_FUNCTION(m,"rootdir",file_kvs_fnc_rootdir);
-	KVSM_REGISTER_FUNCTION(m,"cwd",file_kvs_fnc_cwd);
 	KVSM_REGISTER_FUNCTION(m,"globaldir",file_kvs_fnc_globaldir);
-	KVSM_REGISTER_FUNCTION(m,"extractpath",file_kvs_fnc_extractpath);
-	KVSM_REGISTER_FUNCTION(m,"extractfilename",file_kvs_fnc_extractfilename);
+	KVSM_REGISTER_FUNCTION(m,"homedir",file_kvs_fnc_homedir);
+	KVSM_REGISTER_FUNCTION(m,"localdir",file_kvs_fnc_localdir);
 	KVSM_REGISTER_FUNCTION(m,"ls",file_kvs_fnc_ls);
+	KVSM_REGISTER_FUNCTION(m,"ps",file_kvs_fnc_ps);
+	KVSM_REGISTER_FUNCTION(m,"read",file_kvs_fnc_read);
 	KVSM_REGISTER_FUNCTION(m,"readLines",file_kvs_fnc_readLines);
+	KVSM_REGISTER_FUNCTION(m,"rootdir",file_kvs_fnc_rootdir);
+	KVSM_REGISTER_FUNCTION(m,"size",file_kvs_fnc_size);
+	KVSM_REGISTER_FUNCTION(m,"type",file_kvs_fnc_type);
 
 	return true;
 }
@@ -1383,7 +1382,8 @@ static bool file_module_cleanup(KviModule *)
 KVIRC_MODULE(
 	"File",                                                 // module name
 	"4.0.0",                                                // module version
-	"Copyright (C) 2001 Szymon Stefanek (pragma at kvirc dot net)", // author & (C)
+	"Copyright (C) 2001 Szymon Stefanek (pragma at kvirc dot net)" \
+	"          (C) 2010 Elvio Basello (hell at hellvis69 dot netsons dot org)", // author & (C)
 	"Interface to the file system",
 	file_module_init,
 	0,