Author: dylan
Date: 2005-07-05 19:30:52 -0400 (Tue, 05 Jul 2005)
New Revision: 839
Added:
trunk/clients/haver-qt/
trunk/clients/haver-qt/haver-qt.pro
trunk/clients/haver-qt/images/
trunk/clients/haver-qt/images/editcopy
trunk/clients/haver-qt/images/editcut
trunk/clients/haver-qt/images/editpaste
trunk/clients/haver-qt/images/filenew
trunk/clients/haver-qt/images/fileopen
trunk/clients/haver-qt/images/filesave
trunk/clients/haver-qt/images/print
trunk/clients/haver-qt/images/redo
trunk/clients/haver-qt/images/searchfind
trunk/clients/haver-qt/images/undo
trunk/clients/haver-qt/main.cpp
trunk/clients/haver-qt/wmain.ui
trunk/clients/haver-qt/wmain.ui.h
Removed:
trunk/haver-qt/
Modified:
trunk/
trunk/docs/manual/formats.texi
trunk/perl/core/lib/Haver/Util.pm
Log:
[EMAIL PROTECTED]: dylan | 2005-07-05 19:30:40 -0400
haver-qt belongs in clients.
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/havercurs-objc:43089
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk:11166
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk-merge-10131:11178
27e50396-46e3-0310-8b22-ae223a1f35ce:/local:212
e9404bb1-7af0-0310-a7ff-e22194cd388b:/haver/local:1218
edfcd8bd-4ce7-0310-a97e-bb1efd40edf3:/local:238
+ 1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/havercurs-objc:43089
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk:11166
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk-merge-10131:11178
27e50396-46e3-0310-8b22-ae223a1f35ce:/local:212
e9404bb1-7af0-0310-a7ff-e22194cd388b:/haver/local:1219
edfcd8bd-4ce7-0310-a97e-bb1efd40edf3:/local:238
Added: trunk/clients/haver-qt/haver-qt.pro
===================================================================
--- trunk/clients/haver-qt/haver-qt.pro 2005-07-05 23:30:46 UTC (rev 838)
+++ trunk/clients/haver-qt/haver-qt.pro 2005-07-05 23:30:52 UTC (rev 839)
@@ -0,0 +1,28 @@
+TEMPLATE = app
+LANGUAGE = C++
+
+CONFIG += qt warn_on release
+
+SOURCES += main.cpp
+
+FORMS = wmain.ui
+
+IMAGES = images/filenew \
+ images/fileopen \
+ images/filesave \
+ images/print \
+ images/undo \
+ images/redo \
+ images/editcut \
+ images/editcopy \
+ images/editpaste \
+ images/searchfind
+
+unix {
+ UI_DIR = .ui
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+
+
Added: trunk/clients/haver-qt/images/editcopy
===================================================================
(Binary files differ)
Property changes on: trunk/clients/haver-qt/images/editcopy
___________________________________________________________________
Name: svn:mime-type
+ image/x-png
Added: trunk/clients/haver-qt/images/editcut
===================================================================
(Binary files differ)
Property changes on: trunk/clients/haver-qt/images/editcut
___________________________________________________________________
Name: svn:mime-type
+ image/x-png
Added: trunk/clients/haver-qt/images/editpaste
===================================================================
(Binary files differ)
Property changes on: trunk/clients/haver-qt/images/editpaste
___________________________________________________________________
Name: svn:mime-type
+ image/x-png
Added: trunk/clients/haver-qt/images/filenew
===================================================================
(Binary files differ)
Property changes on: trunk/clients/haver-qt/images/filenew
___________________________________________________________________
Name: svn:mime-type
+ image/x-png
Added: trunk/clients/haver-qt/images/fileopen
===================================================================
(Binary files differ)
Property changes on: trunk/clients/haver-qt/images/fileopen
___________________________________________________________________
Name: svn:mime-type
+ image/x-png
Added: trunk/clients/haver-qt/images/filesave
===================================================================
(Binary files differ)
Property changes on: trunk/clients/haver-qt/images/filesave
___________________________________________________________________
Name: svn:mime-type
+ image/x-png
Added: trunk/clients/haver-qt/images/print
===================================================================
(Binary files differ)
Property changes on: trunk/clients/haver-qt/images/print
___________________________________________________________________
Name: svn:mime-type
+ image/x-png
Added: trunk/clients/haver-qt/images/redo
===================================================================
(Binary files differ)
Property changes on: trunk/clients/haver-qt/images/redo
___________________________________________________________________
Name: svn:mime-type
+ image/x-png
Added: trunk/clients/haver-qt/images/searchfind
===================================================================
(Binary files differ)
Property changes on: trunk/clients/haver-qt/images/searchfind
___________________________________________________________________
Name: svn:mime-type
+ image/x-png
Added: trunk/clients/haver-qt/images/undo
===================================================================
(Binary files differ)
Property changes on: trunk/clients/haver-qt/images/undo
___________________________________________________________________
Name: svn:mime-type
+ image/x-png
Added: trunk/clients/haver-qt/main.cpp
===================================================================
--- trunk/clients/haver-qt/main.cpp 2005-07-05 23:30:46 UTC (rev 838)
+++ trunk/clients/haver-qt/main.cpp 2005-07-05 23:30:52 UTC (rev 839)
@@ -0,0 +1,11 @@
+#include <qapplication.h>
+#include "wmain.h"
+
+int main( int argc, char ** argv )
+{
+ QApplication a( argc, argv );
+ WMain w;
+ w.show();
+ a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( quit() ) );
+ return a.exec();
+}
Added: trunk/clients/haver-qt/wmain.ui
===================================================================
--- trunk/clients/haver-qt/wmain.ui 2005-07-05 23:30:46 UTC (rev 838)
+++ trunk/clients/haver-qt/wmain.ui 2005-07-05 23:30:52 UTC (rev 839)
@@ -0,0 +1,444 @@
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
+<class>WMain</class>
+<widget class="QMainWindow">
+ <property name="name">
+ <cstring>WMain</cstring>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>603</width>
+ <height>480</height>
+ </rect>
+ </property>
+ <property name="caption">
+ <string>Haver Qt</string>
+ </property>
+ <widget class="QLineEdit">
+ <property name="name">
+ <cstring>entryArea</cstring>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>11</x>
+ <y>386</y>
+ <width>581</width>
+ <height>29</height>
+ </rect>
+ </property>
+ </widget>
+ <widget class="QTextEdit">
+ <property name="name">
+ <cstring>displayArea</cstring>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>11</x>
+ <y>11</y>
+ <width>581</width>
+ <height>369</height>
+ </rect>
+ </property>
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
+ <property name="undoRedoEnabled">
+ <bool>false</bool>
+ </property>
+ </widget>
+</widget>
+<menubar>
+ <property name="name">
+ <cstring>MenuBar</cstring>
+ </property>
+ <item text="&File" name="fileMenu">
+ <action name="fileNewAction"/>
+ <action name="fileOpenAction"/>
+ <action name="fileSaveAction"/>
+ <action name="fileSaveAsAction"/>
+ <separator/>
+ <action name="filePrintAction"/>
+ <separator/>
+ <action name="fileExitAction"/>
+ </item>
+ <item text="&Edit" name="editMenu">
+ <action name="editUndoAction"/>
+ <action name="editRedoAction"/>
+ <separator/>
+ <action name="editCutAction"/>
+ <action name="editCopyAction"/>
+ <action name="editPasteAction"/>
+ <separator/>
+ <action name="editFindAction"/>
+ </item>
+ <item text="&Help" name="helpMenu">
+ <action name="helpContentsAction"/>
+ <action name="helpIndexAction"/>
+ <separator/>
+ <action name="helpAboutAction"/>
+ </item>
+</menubar>
+<toolbars>
+</toolbars>
+<actions>
+ <action>
+ <property name="name">
+ <cstring>fileNewAction</cstring>
+ </property>
+ <property name="iconSet">
+ <iconset>filenew</iconset>
+ </property>
+ <property name="text">
+ <string>New</string>
+ </property>
+ <property name="menuText">
+ <string>&New</string>
+ </property>
+ <property name="accel">
+ <string>Ctrl+N</string>
+ </property>
+ </action>
+ <action>
+ <property name="name">
+ <cstring>fileOpenAction</cstring>
+ </property>
+ <property name="iconSet">
+ <iconset>fileopen</iconset>
+ </property>
+ <property name="text">
+ <string>Open</string>
+ </property>
+ <property name="menuText">
+ <string>&Open...</string>
+ </property>
+ <property name="accel">
+ <string>Ctrl+O</string>
+ </property>
+ </action>
+ <action>
+ <property name="name">
+ <cstring>fileSaveAction</cstring>
+ </property>
+ <property name="iconSet">
+ <iconset>filesave</iconset>
+ </property>
+ <property name="text">
+ <string>Save</string>
+ </property>
+ <property name="menuText">
+ <string>&Save</string>
+ </property>
+ <property name="accel">
+ <string>Ctrl+S</string>
+ </property>
+ </action>
+ <action>
+ <property name="name">
+ <cstring>fileSaveAsAction</cstring>
+ </property>
+ <property name="text">
+ <string>Save As</string>
+ </property>
+ <property name="menuText">
+ <string>Save &As...</string>
+ </property>
+ <property name="accel">
+ <string></string>
+ </property>
+ </action>
+ <action>
+ <property name="name">
+ <cstring>filePrintAction</cstring>
+ </property>
+ <property name="iconSet">
+ <iconset>print</iconset>
+ </property>
+ <property name="text">
+ <string>Print</string>
+ </property>
+ <property name="menuText">
+ <string>&Print...</string>
+ </property>
+ <property name="accel">
+ <string>Ctrl+P</string>
+ </property>
+ </action>
+ <action>
+ <property name="name">
+ <cstring>fileExitAction</cstring>
+ </property>
+ <property name="text">
+ <string>Exit</string>
+ </property>
+ <property name="menuText">
+ <string>E&xit</string>
+ </property>
+ <property name="accel">
+ <string></string>
+ </property>
+ </action>
+ <action>
+ <property name="name">
+ <cstring>editUndoAction</cstring>
+ </property>
+ <property name="iconSet">
+ <iconset>undo</iconset>
+ </property>
+ <property name="text">
+ <string>Undo</string>
+ </property>
+ <property name="menuText">
+ <string>&Undo</string>
+ </property>
+ <property name="accel">
+ <string>Ctrl+Z</string>
+ </property>
+ </action>
+ <action>
+ <property name="name">
+ <cstring>editRedoAction</cstring>
+ </property>
+ <property name="iconSet">
+ <iconset>redo</iconset>
+ </property>
+ <property name="text">
+ <string>Redo</string>
+ </property>
+ <property name="menuText">
+ <string>&Redo</string>
+ </property>
+ <property name="accel">
+ <string>Ctrl+Y</string>
+ </property>
+ </action>
+ <action>
+ <property name="name">
+ <cstring>editCutAction</cstring>
+ </property>
+ <property name="iconSet">
+ <iconset>editcut</iconset>
+ </property>
+ <property name="text">
+ <string>Cut</string>
+ </property>
+ <property name="menuText">
+ <string>Cu&t</string>
+ </property>
+ <property name="accel">
+ <string>Ctrl+X</string>
+ </property>
+ </action>
+ <action>
+ <property name="name">
+ <cstring>editCopyAction</cstring>
+ </property>
+ <property name="iconSet">
+ <iconset>editcopy</iconset>
+ </property>
+ <property name="text">
+ <string>Copy</string>
+ </property>
+ <property name="menuText">
+ <string>&Copy</string>
+ </property>
+ <property name="accel">
+ <string>Ctrl+C</string>
+ </property>
+ </action>
+ <action>
+ <property name="name">
+ <cstring>editPasteAction</cstring>
+ </property>
+ <property name="iconSet">
+ <iconset>editpaste</iconset>
+ </property>
+ <property name="text">
+ <string>Paste</string>
+ </property>
+ <property name="menuText">
+ <string>&Paste</string>
+ </property>
+ <property name="accel">
+ <string>Ctrl+V</string>
+ </property>
+ </action>
+ <action>
+ <property name="name">
+ <cstring>editFindAction</cstring>
+ </property>
+ <property name="iconSet">
+ <iconset>searchfind</iconset>
+ </property>
+ <property name="text">
+ <string>Find</string>
+ </property>
+ <property name="menuText">
+ <string>&Find...</string>
+ </property>
+ <property name="accel">
+ <string>Ctrl+F</string>
+ </property>
+ </action>
+ <action>
+ <property name="name">
+ <cstring>helpContentsAction</cstring>
+ </property>
+ <property name="text">
+ <string>Contents</string>
+ </property>
+ <property name="menuText">
+ <string>&Contents...</string>
+ </property>
+ <property name="accel">
+ <string></string>
+ </property>
+ </action>
+ <action>
+ <property name="name">
+ <cstring>helpIndexAction</cstring>
+ </property>
+ <property name="text">
+ <string>Index</string>
+ </property>
+ <property name="menuText">
+ <string>&Index...</string>
+ </property>
+ <property name="accel">
+ <string></string>
+ </property>
+ </action>
+ <action>
+ <property name="name">
+ <cstring>helpAboutAction</cstring>
+ </property>
+ <property name="text">
+ <string>About</string>
+ </property>
+ <property name="menuText">
+ <string>&About</string>
+ </property>
+ <property name="accel">
+ <string></string>
+ </property>
+ </action>
+</actions>
+<connections>
+ <connection>
+ <sender>fileNewAction</sender>
+ <signal>activated()</signal>
+ <receiver>WMain</receiver>
+ <slot>fileNew()</slot>
+ </connection>
+ <connection>
+ <sender>fileOpenAction</sender>
+ <signal>activated()</signal>
+ <receiver>WMain</receiver>
+ <slot>fileOpen()</slot>
+ </connection>
+ <connection>
+ <sender>fileSaveAction</sender>
+ <signal>activated()</signal>
+ <receiver>WMain</receiver>
+ <slot>fileSave()</slot>
+ </connection>
+ <connection>
+ <sender>fileSaveAsAction</sender>
+ <signal>activated()</signal>
+ <receiver>WMain</receiver>
+ <slot>fileSaveAs()</slot>
+ </connection>
+ <connection>
+ <sender>filePrintAction</sender>
+ <signal>activated()</signal>
+ <receiver>WMain</receiver>
+ <slot>filePrint()</slot>
+ </connection>
+ <connection>
+ <sender>fileExitAction</sender>
+ <signal>activated()</signal>
+ <receiver>WMain</receiver>
+ <slot>fileExit()</slot>
+ </connection>
+ <connection>
+ <sender>editUndoAction</sender>
+ <signal>activated()</signal>
+ <receiver>WMain</receiver>
+ <slot>editUndo()</slot>
+ </connection>
+ <connection>
+ <sender>editRedoAction</sender>
+ <signal>activated()</signal>
+ <receiver>WMain</receiver>
+ <slot>editRedo()</slot>
+ </connection>
+ <connection>
+ <sender>editCutAction</sender>
+ <signal>activated()</signal>
+ <receiver>WMain</receiver>
+ <slot>editCut()</slot>
+ </connection>
+ <connection>
+ <sender>editPasteAction</sender>
+ <signal>activated()</signal>
+ <receiver>WMain</receiver>
+ <slot>editPaste()</slot>
+ </connection>
+ <connection>
+ <sender>editFindAction</sender>
+ <signal>activated()</signal>
+ <receiver>WMain</receiver>
+ <slot>editFind()</slot>
+ </connection>
+ <connection>
+ <sender>helpIndexAction</sender>
+ <signal>activated()</signal>
+ <receiver>WMain</receiver>
+ <slot>helpIndex()</slot>
+ </connection>
+ <connection>
+ <sender>helpContentsAction</sender>
+ <signal>activated()</signal>
+ <receiver>WMain</receiver>
+ <slot>helpContents()</slot>
+ </connection>
+ <connection>
+ <sender>helpAboutAction</sender>
+ <signal>activated()</signal>
+ <receiver>WMain</receiver>
+ <slot>helpAbout()</slot>
+ </connection>
+ <connection>
+ <sender>entryArea</sender>
+ <signal>returnPressed()</signal>
+ <receiver>WMain</receiver>
+ <slot>dispatchLine()</slot>
+ </connection>
+</connections>
+<includes>
+ <include location="local" impldecl="in implementation">wmain.ui.h</include>
+</includes>
+<signals>
+ <signal>processLine(QString)</signal>
+</signals>
+<slots>
+ <slot>fileNew()</slot>
+ <slot>fileOpen()</slot>
+ <slot>fileSave()</slot>
+ <slot>fileSaveAs()</slot>
+ <slot>filePrint()</slot>
+ <slot>fileExit()</slot>
+ <slot>editUndo()</slot>
+ <slot>editRedo()</slot>
+ <slot>editCut()</slot>
+ <slot>editCopy()</slot>
+ <slot>editPaste()</slot>
+ <slot>editFind()</slot>
+ <slot>helpIndex()</slot>
+ <slot>helpContents()</slot>
+ <slot>helpAbout()</slot>
+ <slot>dispatchLine()</slot>
+</slots>
+<pixmapinproject/>
+<layoutdefaults spacing="6" margin="11"/>
+</UI>
Added: trunk/clients/haver-qt/wmain.ui.h
===================================================================
--- trunk/clients/haver-qt/wmain.ui.h 2005-07-05 23:30:46 UTC (rev 838)
+++ trunk/clients/haver-qt/wmain.ui.h 2005-07-05 23:30:52 UTC (rev 839)
@@ -0,0 +1,112 @@
+/****************************************************************************
+** ui.h extension file, included from the uic-generated form implementation.
+**
+** If you want to add, delete, or rename functions or slots, use
+** Qt Designer to update this file, preserving your code.
+**
+** You should not define a constructor or destructor in this file.
+** Instead, write your code in functions called init() and destroy().
+** These will automatically be called by the form's constructor and
+** destructor.
+*****************************************************************************/
+
+
+void WMain::fileNew()
+{
+
+}
+
+
+void WMain::fileOpen()
+{
+
+}
+
+
+void WMain::fileSave()
+{
+
+}
+
+
+void WMain::fileSaveAs()
+{
+
+}
+
+
+void WMain::filePrint()
+{
+
+}
+
+
+void WMain::fileExit()
+{
+
+}
+
+
+void WMain::editUndo()
+{
+
+}
+
+
+void WMain::editRedo()
+{
+
+}
+
+
+void WMain::editCut()
+{
+
+}
+
+
+void WMain::editCopy()
+{
+
+}
+
+
+void WMain::editPaste()
+{
+
+}
+
+
+void WMain::editFind()
+{
+
+}
+
+
+void WMain::helpIndex()
+{
+
+}
+
+
+void WMain::helpContents()
+{
+
+}
+
+
+void WMain::helpAbout()
+{
+
+}
+
+
+void WMain::dispatchLine()
+{
+ QLineEdit *entry = this->entryArea;
+ QTextEdit *text = this->displayArea;
+ QString line = entry->text();
+ entry->clear();
+ emit processLine(line);
+ text->append(line);
+}
Modified: trunk/docs/manual/formats.texi
===================================================================
--- trunk/docs/manual/formats.texi 2005-07-05 23:30:46 UTC (rev 838)
+++ trunk/docs/manual/formats.texi 2005-07-05 23:30:52 UTC (rev 839)
@@ -46,7 +46,7 @@
@section Identifiers
A valid identifier must match the perl-style regular expression:
[EMAIL PROTECTED]/&?[a-z][a-z0-9_.'@-]+/i!}.
[EMAIL PROTECTED]/&?[a-z][a-z0-9_.'[EMAIL PROTECTED]/i!}.
Identifiers are case insensitive.
Identifiers beginning with @code{&} or containing @code{@@} are reserved by
the server.
@@ -68,5 +68,7 @@
as the same account from different clients.
The passcode for a user on server $host (as given by the @cmd{HOST} server
message)
-with password $password is @code{sha1($password + $host)} where @code{+}
indicates concatenation
+with password $password is @code{sha1($password + $host + $user)} where
@code{+} indicates concatenation
of strings and sha1 is the SHA1 hash function defined in @cite{RFC 3174} and
@cite{FIPS 180-1}.
+The hash is encoded using Base64.
+
Modified: trunk/perl/core/lib/Haver/Util.pm
===================================================================
--- trunk/perl/core/lib/Haver/Util.pm 2005-07-05 23:30:46 UTC (rev 838)
+++ trunk/perl/core/lib/Haver/Util.pm 2005-07-05 23:30:52 UTC (rev 839)
@@ -8,9 +8,11 @@
our $VERSION = 0.02;
our @EXPORT = ();
-our @EXPORT_OK = qw( is_valid_name is_reserved_name );
+our @EXPORT_OK = qw( is_valid_name is_reserved_name is_known_namespace );
our %EXPORT_TAGS = (
name => [qw( is_valid_name is_reserved_name )],
+ ns => [qw( is_known_namespace )],
+ all => [EMAIL PROTECTED],
);
our $NamePattern = qr/^&?[a-z][a-z0-9_.'[EMAIL PROTECTED]/i;
@@ -27,7 +29,12 @@
$name =~ /^&/ or $name =~ /@/;
}
+sub is_known_namespace {
+ my $ns = shift;
+ $ns and ($ns eq 'user' or $ns eq 'channel' or $ns eq 'service')
+}
+
1;
__END__
=head1 NAME
