From nobody Thu Feb 29 12:08:31 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TlqkS0Tmxz5C3bp; Thu, 29 Feb 2024 12:08:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TlqkR5BW0z4Fnl; Thu, 29 Feb 2024 12:08:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709208511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1tO1z9J2hUCNdRdJh0zGjxv7240ZcFJjthtkAj7vJgI=; b=l+a3cHnl6rRzbiot5c0plJShQy/wbkVn8hKj+hl20AbXtm4fHJn4rSa44KOckUORJ15ARB NYzHg0bqujn6H5fqqrE30do3FvUnQmDjNSzRMw7BCmThePz2OuASSaqxan31DWxaOuo5FX niEKP6tpLJVNyUAZF0o4WqhJLGm8Xp+YsExX76lrFHJElW8G2d5AGdBcL1F2ToRTf36LFG socLNejTHXDHhbkj/3/CjozgjfoNcGOsDmhzbMaNSRxbH10TX58Nshb2mSgCh1K6ZfeBUX 1+/bSREzNerqPN36cOgsA0YHjpl1k90nqvz+0RDb+sNaVBcmbzJ/mhYESAtTmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709208511; a=rsa-sha256; cv=none; b=W3NhlHVAcl0uUD8s4lrT7HZ58dcAAKQ2TqY41iRxe9U/gQe+/Pr/uLvdSPtabuh4qU9v8y xkr24X7s6NO4IRbJwYw2WLos1n5OO1A0dwAnp9QHOOsAIRefF8ute2NFJIyNDYRbGtIahM 1kmQEFMQCqELUQr/njuKjB6RGgavwpHNmkNJu17X34MZUTdoDGzmd2alpMFYglhfWNKriI XkXHTjUoqDdULI1tYQ2YNY+xXiRMaMx6KR4RQsHV/ZkH21Gpqzmon25pfVnx4wgXOoMOeR br2Mq7rn56+CA8+n39afApqiPSNGXrb8VtyjYrEkXQaJO/oeyTeb9O8fiitgMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709208511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1tO1z9J2hUCNdRdJh0zGjxv7240ZcFJjthtkAj7vJgI=; b=PFTvEeZl4TSbr/+XvA1FVochDEgrQ8B7yI+T3KNMIhoXiih4ggOi0siYes/2SihAcLElHh VF7P4/HjTWJtkyJnxPdYLpvyatx0sYbtn7pauap/J4SRI8NSS1qk7/R+kmV7CvkPnJb7JK ZmnqkypdBpAOpkfbfQFwJ/4kSz874SlsyA86MF0mCxwi2Ph1l2g6+vveH4XBr7KQ9P9nZf PNoeZZxjMItqXQiJd0KgCEewTvyNRTs8EYQBrUCkg4sJISgkm7xbSl4Ikul75xoK9tWOa4 /Fs59IQ+VqsDOhqvYoyO8zSot3hnZFwg47lQnlq48lKKGkHUvfeEzlwKNOWQcQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TlqkR4dnCzhVP; Thu, 29 Feb 2024 12:08:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41TC8Vgp084763; Thu, 29 Feb 2024 12:08:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41TC8Vbh084760; Thu, 29 Feb 2024 12:08:31 GMT (envelope-from git) Date: Thu, 29 Feb 2024 12:08:31 GMT Message-Id: <202402291208.41TC8Vbh084760@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: b9730c529d60 - main - finance/xtrader: Remove expired port List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9730c529d6018650e22416e2d4dc062dd9ed4ae Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=b9730c529d6018650e22416e2d4dc062dd9ed4ae commit b9730c529d6018650e22416e2d4dc062dd9ed4ae Author: Muhammad Moinur Rahman AuthorDate: 2024-02-29 11:51:54 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2024-02-29 11:51:54 +0000 finance/xtrader: Remove expired port finance/xtrader --- MOVED | 1 + finance/Makefile | 1 - finance/xtrader/Makefile | 45 ----------- finance/xtrader/distinfo | 2 - finance/xtrader/files/patch-Makefile.linux | 21 ------ finance/xtrader/files/patch-util_fl_Fl_Table.cpp | 56 -------------- finance/xtrader/files/patch-util_fl_Fl_Table.h | 26 ------- .../files/patch-xtrader_src_dlg_DownloadDlg.cpp | 40 ---------- .../files/patch-xtrader_src_dlg_DownloadDlg.h | 19 ----- .../files/patch-xtrader_src_dlg_ExportDlg.cpp | 41 ---------- .../files/patch-xtrader_src_dlg_ExportDlg.h | 19 ----- .../files/patch-xtrader_src_gui_ReportView.cpp | 51 ------------- .../files/patch-xtrader_src_gui_XTrader.cpp | 87 ---------------------- finance/xtrader/pkg-descr | 7 -- 14 files changed, 1 insertion(+), 415 deletions(-) diff --git a/MOVED b/MOVED index 9f49188f59c8..c5b8109174da 100644 --- a/MOVED +++ b/MOVED @@ -3008,3 +3008,4 @@ dns/dns_balance||2024-02-29|Has expired: Abandonware, last release in 2005. Cons dns/dnscheckengine||2024-02-29|Has expired: Deprecated upstream in favour of Zonemaster Project dns/sheerdns||2024-02-29|Has expired: Abandonware, upstream dead and last update over 10 years ago finance/cointop||2024-02-29|Has expired: Repo archived upstream Nov 18, 2023 +finance/xtrader||2024-02-29|Has expired: Abandoned upstream diff --git a/finance/Makefile b/finance/Makefile index e1c928db88a1..29393196ea1b 100644 --- a/finance/Makefile +++ b/finance/Makefile @@ -150,6 +150,5 @@ SUBDIR += tickrs SUBDIR += venice SUBDIR += weberp - SUBDIR += xtrader .include diff --git a/finance/xtrader/Makefile b/finance/xtrader/Makefile deleted file mode 100644 index 753f2aadb206..000000000000 --- a/finance/xtrader/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -PORTNAME= xtrader -PORTVERSION= 0.99.9 -PORTREVISION= 10 -CATEGORIES= finance -MASTER_SITES= SF/${PORTNAME}/OldFiles - -MAINTAINER= ports@FreeBSD.org -COMMENT= Technical analysis program for financial instruments -WWW= https://xtrader.sourceforge.net/ - -DEPRECATED= Abandoned upstream -EXPIRATION_DATE= 2024-02-29 - -LIB_DEPENDS= libptypes.so:devel/ptypes \ - libfltk.so.1:x11-toolkits/fltk - -USES= gmake xorg -USE_XORG= x11 xpm - -MAKEFILE= Makefile.linux - -CFLAGS+= --std=c++14 - -NO_WRKSUBDIR= yes -BUILD_WRKSRC= ${WRKSRC}/${PORTNAME} - -PLIST_FILES= bin/xtrader \ - %%DATADIR%%/sample.xt - -post-patch: - ${REINPLACE_CMD} -e 's|char|const char|' \ - ${WRKSRC}/xtrader/src/Resource.cpp - ${REINPLACE_CMD} -e 's|static char|static const char|' \ - ${WRKSRC}/xtrader/src/Resource.h - ${REINPLACE_CMD} -e 's|int(data)|(unsigned long)data|' \ - ${WRKSRC}/xtrader/src/gui/XTrader.h - ${FIND} ${WRKSRC} -type f -name "*.cpp" -o -name "*.h" | ${XARGS} \ - ${REINPLACE_CMD} -e '/^#include $$|.H>|; s|fl_file_chooser|Fl_File_Chooser|g' - -do-install: - @${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/sample.xt ${STAGEDIR}${DATADIR} - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}/xtrader ${STAGEDIR}${PREFIX}/bin - -.include diff --git a/finance/xtrader/distinfo b/finance/xtrader/distinfo deleted file mode 100644 index 6c4190780bc4..000000000000 --- a/finance/xtrader/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xtrader-0.99.9.tar.gz) = 9e423e633d795cb89c9b9485c26a166cf016b87a9543f43e025a638a30b9b87c -SIZE (xtrader-0.99.9.tar.gz) = 644928 diff --git a/finance/xtrader/files/patch-Makefile.linux b/finance/xtrader/files/patch-Makefile.linux deleted file mode 100644 index 387ee358495e..000000000000 --- a/finance/xtrader/files/patch-Makefile.linux +++ /dev/null @@ -1,21 +0,0 @@ ---- ./xtrader/Makefile.linux.orig 2004-10-22 00:21:08.000000000 +0200 -+++ ./xtrader/Makefile.linux 2011-11-15 13:46:18.000000000 +0100 -@@ -1,12 +1,12 @@ --COMP= g++ --IFLAGS= -I../util -Isrc -I/usr/local/include -I/usr/include/ptypes --CFLAGS= -march=i586 -O3 -Wall -Wno-format-y2k --LFLAGS= -L/usr/local/lib -lz -lfltk -lptypes -lexpat -L/usr/X11R6/lib -lm -lXpm -lX11 -ldl -lpthread -lXft --LFLAGS2= -L/usr/local/lib -lfltk_ -lptypes -L/usr/X11R6/lib -lXpm -lX11 -ldl -lpthread -+COMP= $(CXX) -+IFLAGS= -I../util -Isrc -I$(LOCALBASE)/include -I$(LOCALBASE)/include/ptypes -+CFLAGS:= $(CFLAGS) -Wno-format-y2k -+LFLAGS= -L$(LOCALBASE)/lib -lz -lfltk -lptypes -lexpat -lm -lXpm -lX11 -pthread -lXft -lcompat -+LFLAGS2= -L$(LOCALBASE)/lib -lfltk -lptypes -lXpm -lX11 -pthread - XTRADER= xtrader - XTRADER2= xtrader.static - --all: $(XTRADER) $(XTRADER2) -+all: $(XTRADER) - - XTRADER_OBJ=../util/MH.o ../util/MHCSVFile.o \ - ../util/MHDate.o ../util/MHDayChart.o ../util/MHDC.o \ diff --git a/finance/xtrader/files/patch-util_fl_Fl_Table.cpp b/finance/xtrader/files/patch-util_fl_Fl_Table.cpp deleted file mode 100644 index c55ec51c0f62..000000000000 --- a/finance/xtrader/files/patch-util_fl_Fl_Table.cpp +++ /dev/null @@ -1,56 +0,0 @@ ---- ./util/fl/Fl_Table.cpp.orig 2004-11-14 11:21:29.000000000 +0100 -+++ ./util/fl/Fl_Table.cpp 2011-11-15 13:46:19.000000000 +0100 -@@ -10,15 +10,15 @@ - #include "Fl_Select.h" - #include "Fl_Find.h" - #include "Fl_Defines.h" --#include --#include --#include --#include --#include --#include --#include --#include --#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include - #include - #include - #include -@@ -962,7 +962,14 @@ - } - } - -- -+/** -+ * Callback for file chooser -+ */ -+void tab_fc_callback(Fl_File_Chooser *fc, void *data) -+{ -+ Fl_Table *t = static_cast(data); -+ t->aData->value (fc->value(), t->aCurrRow, t->aCurrCol); -+} - - /** - * Start to edit a cell -@@ -983,9 +990,10 @@ - - } - else if (aData->editor_type (aCurrRow, aCurrCol, false) == FL_DLG_FILE_EDITOR) { -- char* file = fl_file_chooser("Select File", "*", aData->value(aCurrRow, aCurrCol)); -- aData->value (file, aCurrRow, aCurrCol); - -+ Fl_File_Chooser *fc = new Fl_File_Chooser("Select File", "*", Fl_File_Chooser::SINGLE, aData->value(aCurrRow, aCurrCol)); -+ fc->callback(tab_fc_callback, this); -+ delete fc; - } - else { - aEditWidget = aData->editor (aCurrRow, aCurrCol, force_custom); diff --git a/finance/xtrader/files/patch-util_fl_Fl_Table.h b/finance/xtrader/files/patch-util_fl_Fl_Table.h deleted file mode 100644 index 02db64451ad4..000000000000 --- a/finance/xtrader/files/patch-util_fl_Fl_Table.h +++ /dev/null @@ -1,26 +0,0 @@ ---- ./util/fl/Fl_Table.h.orig 2004-11-14 11:21:34.000000000 +0100 -+++ ./util/fl/Fl_Table.h 2011-11-15 13:46:19.000000000 +0100 -@@ -12,12 +12,13 @@ - #define snprintf _snprintf - #endif - --#include -+#include - #include "Fl_Table_Data.h" - - class Fl_Input; - class Fl_Scrollbar; - class Fl_Find; -+class Fl_File_Chooser; - - enum { - FL_DATA_CHANGE = 1000, -@@ -121,6 +122,8 @@ - void get_cell_pos (int& row, int& col, int& xpos, int& ypos, int& width, int& height); - void start_edit_mode (bool force = false); - void set_cursor(int row, int col) {move_cursor (row - aCurrRow, col - aCurrCol);} -+ friend void tab_fc_callback(Fl_File_Chooser *fc, void *data); -+ - }; - - #endif diff --git a/finance/xtrader/files/patch-xtrader_src_dlg_DownloadDlg.cpp b/finance/xtrader/files/patch-xtrader_src_dlg_DownloadDlg.cpp deleted file mode 100644 index 66b6221ea404..000000000000 --- a/finance/xtrader/files/patch-xtrader_src_dlg_DownloadDlg.cpp +++ /dev/null @@ -1,40 +0,0 @@ ---- ./xtrader/src/dlg/DownloadDlg.cpp.orig 2004-11-14 11:21:30.000000000 +0100 -+++ ./xtrader/src/dlg/DownloadDlg.cpp 2011-11-15 13:46:19.000000000 +0100 -@@ -21,8 +21,8 @@ - #include "Enums.h" - #include "Progress.h" - #include "Resource.h" --#include --#include -+#include -+#include - #include - #include - #include -@@ -164,13 +164,24 @@ - } - - -+/** -+ * Callback for file chooser -+ */ -+void dlg_fc_callback(Fl_File_Chooser *fc, void *data) -+{ -+ DownloadDlg *d = static_cast(data); -+ const char *file = fc->value(); -+ if (file && *file) d->aFile->value(file); -+ -+} - - /** - * Browse for result file name - */ - void DownloadDlg::cb3 () { -- char* file = fl_file_chooser (STRING(DLG_SELECT_WRITE_FILE), "*.*", ""); -- if (file && *file) aFile->value (file); -+ Fl_File_Chooser *fc = new Fl_File_Chooser (STRING(DLG_SELECT_WRITE_FILE), "*.*", Fl_File_Chooser::SINGLE, ""); -+ fc->callback(dlg_fc_callback, this); -+ delete fc; - } - - diff --git a/finance/xtrader/files/patch-xtrader_src_dlg_DownloadDlg.h b/finance/xtrader/files/patch-xtrader_src_dlg_DownloadDlg.h deleted file mode 100644 index 38ec0f85621d..000000000000 --- a/finance/xtrader/files/patch-xtrader_src_dlg_DownloadDlg.h +++ /dev/null @@ -1,19 +0,0 @@ ---- ./xtrader/src/dlg/DownloadDlg.h.orig 2004-11-14 11:21:35.000000000 +0100 -+++ ./xtrader/src/dlg/DownloadDlg.h 2011-11-15 13:46:19.000000000 +0100 -@@ -18,6 +18,7 @@ - #include - - class Report; -+class Fl_File_Chooser; - - - -@@ -51,6 +52,8 @@ - Fl_Button* aClose; - - void download (int type, const char* start, const char* stop, int action); -+ -+ friend void dlg_fc_callback(Fl_File_Chooser *fc, void *data); - }; - - #endif diff --git a/finance/xtrader/files/patch-xtrader_src_dlg_ExportDlg.cpp b/finance/xtrader/files/patch-xtrader_src_dlg_ExportDlg.cpp deleted file mode 100644 index d949b682b6bc..000000000000 --- a/finance/xtrader/files/patch-xtrader_src_dlg_ExportDlg.cpp +++ /dev/null @@ -1,41 +0,0 @@ ---- ./xtrader/src/dlg/ExportDlg.cpp.orig 2004-11-14 11:21:29.000000000 +0100 -+++ ./xtrader/src/dlg/ExportDlg.cpp 2011-11-15 13:46:19.000000000 +0100 -@@ -14,9 +14,9 @@ - #include - #include - #include --#include --#include --#include -+#include -+#include -+#include - - - -@@ -134,13 +134,23 @@ - } - - -+/** -+ * Callback for file chooser -+ */ -+void exp_fc_callback(Fl_File_Chooser *fc, void *data) -+{ -+ ExportDlg *e = static_cast(data); -+ const char *file = fc->value(); -+ if (file && *file) e->aFile->value(file); -+} - - /** - * Get filename - */ - void ExportDlg::cb3 () { -- char* file = fl_file_chooser (STRING(DLG_SELECT_WRITE_FILE), "*.*", ""); -- if (file && *file) aFile->value (file); -+ Fl_File_Chooser *fc = new Fl_File_Chooser(STRING(DLG_SELECT_WRITE_FILE), "*.*", Fl_File_Chooser::SINGLE, ""); -+ fc->callback(exp_fc_callback, this); -+ delete fc; - } - - diff --git a/finance/xtrader/files/patch-xtrader_src_dlg_ExportDlg.h b/finance/xtrader/files/patch-xtrader_src_dlg_ExportDlg.h deleted file mode 100644 index caebcd376689..000000000000 --- a/finance/xtrader/files/patch-xtrader_src_dlg_ExportDlg.h +++ /dev/null @@ -1,19 +0,0 @@ ---- ./xtrader/src/dlg/ExportDlg.h.orig 2004-11-14 11:21:35.000000000 +0100 -+++ ./xtrader/src/dlg/ExportDlg.h 2011-11-15 13:46:19.000000000 +0100 -@@ -16,6 +16,7 @@ - #include - - class Report; -+class Fl_File_Chooser; - - - -@@ -45,6 +46,8 @@ - Fl_Button* aBrowse; - Fl_Button* aHelp; - Fl_Button* aClose; -+ -+ friend void exp_fc_callback(Fl_File_Chooser *fc, void *data); - }; - - #endif diff --git a/finance/xtrader/files/patch-xtrader_src_gui_ReportView.cpp b/finance/xtrader/files/patch-xtrader_src_gui_ReportView.cpp deleted file mode 100644 index 9edaf9db3340..000000000000 --- a/finance/xtrader/files/patch-xtrader_src_gui_ReportView.cpp +++ /dev/null @@ -1,51 +0,0 @@ ---- ./xtrader/src/gui/ReportView.cpp.orig 2004-11-14 11:21:30.000000000 +0100 -+++ ./xtrader/src/gui/ReportView.cpp 2011-11-15 13:46:19.000000000 +0100 -@@ -21,13 +21,13 @@ - #include "Resource.h" - #include - #include --#include --#include --#include --#include --#include -+#include -+#include -+#include -+#include -+#include - #include --#include -+#include - #include - #include - -@@ -139,7 +139,15 @@ - void ReportView::cbBrowser2 () { - } - -- -+/** -+ * Callback for file chooser -+ */ -+void rep_fc_callback(Fl_File_Chooser *fc, void *data) -+{ -+ Report *r = static_cast(data); -+ const char *file = fc->value(); -+ if (file && *file) r->Save (file); -+} - - /** - * Callback for buttons -@@ -173,8 +181,9 @@ - Report* r = ((ReportData*)aTable->data())->report(); - - if (r) { -- char* file = fl_file_chooser (STRING(DLG_SELECT_WRITE_FILE), "*.*", ""); -- if (file && *file) r->Save (file); -+ Fl_File_Chooser *fc = new Fl_File_Chooser (STRING(DLG_SELECT_WRITE_FILE), "*.*", Fl_File_Chooser::SINGLE, ""); -+ fc->callback(rep_fc_callback, r); -+ delete fc; - } - } - else if (strcmp (button->label(), STRING(SELECT2)) == 0) { diff --git a/finance/xtrader/files/patch-xtrader_src_gui_XTrader.cpp b/finance/xtrader/files/patch-xtrader_src_gui_XTrader.cpp deleted file mode 100644 index ec1e442b9e2b..000000000000 --- a/finance/xtrader/files/patch-xtrader_src_gui_XTrader.cpp +++ /dev/null @@ -1,87 +0,0 @@ ---- ./xtrader/src/gui/XTrader.cpp.orig 2004-11-14 11:21:30.000000000 +0100 -+++ ./xtrader/src/gui/XTrader.cpp 2011-11-15 13:46:19.000000000 +0100 -@@ -34,11 +34,11 @@ - #include "table/SecurityData.h" - #include "table/SetData.h" - #include "table/SetItemData.h" --#include --#include --#include -+#include -+#include -+#include - #include --#include -+#include - #include - #include - #include -@@ -249,6 +249,34 @@ - } - - -+/** -+ * Callback for file chooser -+ */ -+void fc_callback(Fl_File_Chooser *fc, void *data) -+{ -+ XTrader *xt = static_cast(data); -+ const char *file = fc->value(); -+ -+ if (file && *file) { -+ MHDate date; -+ Import* import = 0; -+ double start = MHUtil::Time(); -+ -+ XTrader::StartWork (STRING(INFO_IMPORTING)); -+ try { -+ import = new Import (file); -+ import->Read (); -+ char buffer[100]; -+ snprintf (buffer, 99, "%s (%d %s / %.1fs) (%s=%d)", STRING(INFO_IMPORT_FINISHED), import->Rows(), STRING(ROWS), MHUtil::Time() - start, STRING(ERROR_), import->Errors()); -+ XTrader::SetMessage (buffer); -+ } -+ catch (const char* message) { -+ XTrader::SetError (message); -+ } -+ XTrader::StopWork (""); -+ delete import; -+ } -+} - - /** - * Callback for all menu items -@@ -291,28 +319,11 @@ - break; - - case Resource::MENU_IMPORT: { -- char* file = fl_file_chooser (STRING(DLG_IMPORT), STRING(DLG_IMPORT_FILTER), ""); -- if (file && *file) { -- MHDate date; -- Import* import = 0; -- double start = MHUtil::Time(); -- -- XTrader::StartWork (STRING(INFO_IMPORTING)); -- try { -- import = new Import (file); -- import->Read (); -- char buffer[100]; -- snprintf (buffer, 99, "%s (%d %s / %.1fs) (%s=%d)", STRING(INFO_IMPORT_FINISHED), import->Rows(), STRING(ROWS), MHUtil::Time() - start, STRING(ERROR_), import->Errors()); -- XTrader::SetMessage (buffer); -- } -- catch (const char* message) { -- XTrader::SetError (message); -- } -- XTrader::StopWork (""); -- delete import; -- aListeners->Send (0, "Import", "changed", 0, 0); -- Fl::redraw (); -- } -+ Fl_File_Chooser *fc = new Fl_File_Chooser (STRING(DLG_IMPORT), STRING(DLG_IMPORT_FILTER), Fl_File_Chooser::SINGLE, ""); -+ fc->callback(fc_callback); -+ delete fc; -+ aListeners->Send (0, "Import", "changed", 0, 0); -+ Fl::redraw (); - break; - } - diff --git a/finance/xtrader/pkg-descr b/finance/xtrader/pkg-descr deleted file mode 100644 index 4c65cb0cee35..000000000000 --- a/finance/xtrader/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -Technical analysis program for financial instruments - -Included is also an simple portfolio module where you can - - edit transactions, create reports and charts. - - create price larms report. - - edit all data. - - export all database files to an import file.