OSSP CVS Repository

ossp - Difference in ossp-pkg/as/as-gui/as_assist.cpp versions 1.81 and 1.82
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [History

ossp-pkg/as/as-gui/as_assist.cpp 1.81 -> 1.82

--- as_assist.cpp        2003/01/22 11:36:53     1.81
+++ as_assist.cpp        2003/01/22 23:57:01     1.82
@@ -334,6 +334,7 @@
                                  "from the <b>View</b> menu.</p>";
     m_pRefreshact->setWhatsThis(kszRefreshtext);
 
+#ifdef HAVE_MICO
     // Syncronize data with remote server over IIOP action
     m_pSynciiopact = new QAction(trUtf8("Synchronize over IIOP"), Synciset, trUtf8("&Synchronize IIOP"), CTRL+Key_E, this, "Synchronizeiiop");
     if (m_pSynciiopact == NULL) // Sanity check
@@ -345,7 +346,9 @@
                                   "You can also select the <b>Synchronize</b> command "
                                   "from the <b>Report</b> menu.</p>";
     m_pSynciiopact->setWhatsThis(kszSynciioptext);
+#endif // HAVE_MICO
 
+#ifdef HAVE_ESOAP
     // Syncronize data with remote server over SOAP action
     m_pSyncsoapact = new QAction(trUtf8("Synchronize over SOAP"), Synciset, trUtf8("&Synchronize SOAP"), CTRL+Key_E, this, "Synchronizesoap");
     if (m_pSyncsoapact == NULL) // Sanity check
@@ -357,6 +360,7 @@
                                   "You can also select the <b>Synchronize</b> command "
                                   "from the <b>Report</b> menu.</p>";
     m_pSyncsoapact->setWhatsThis(kszSyncsoaptext);
+#endif // HAVE_ESOAP
 }
 
 //
@@ -469,9 +473,18 @@
     if (pReportpopup == NULL) // Sanity check
         throw Genexcept("Main window report popup creation failed.");
     m_pMenubar->insertItem(trUtf8("&Report"), pReportpopup);
+#ifdef HAVE_MICO
+#define HAS_RPC
     m_pSynciiopact->addTo(pReportpopup);
+#endif // HAVE_MICO
+#ifdef HAVE_ESOAP
+#define HAS_RPC
     m_pSyncsoapact->addTo(pReportpopup);
+#endif // HAVE_ESOAP
+#ifdef HAS_RPC
+    // We only want to add a separator if its needed
     pReportpopup->insertSeparator();
+#endif // HAS_RPC
     nMenuid = pReportpopup->insertItem(trUtf8("&Local Report"), this, SLOT(genReport()));
     pReportpopup->setItemEnabled(nMenuid, false);
 
@@ -990,8 +1003,12 @@
     m_pCutact->setEnabled(bTurned);
     m_pCopyact->setEnabled(bTurned);
     m_pPasteact->setEnabled(bTurned);
+#ifdef HAVE_MICO
     m_pSynciiopact->setEnabled(bTurned);
+#endif // HAVE_MICO
+#ifdef HAVE_ESOAP
     m_pSyncsoapact->setEnabled(bTurned);
+#endif // HAVE_ESOAP
 
     // Unconditional settings
     this->updEdit(m_pMaintable->currentRow());      // Update edit controls

CVSTrac 2.0.1