atl/android_translation_layer
0
0
Fork 0
mirror of https://gitlab.com/android_translation_layer/android_translation_layer.git synced 2025-10-27 11:48:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

replace deprecated GtkFileChooserNative with GtkFileDialog

Browse Source 
Keeping the old implementation inside ifdef for backwards
compatibility with gtk < 4.10
This commit is contained in:
Julian Winkler
2024-07-18 18:56:14 +02:00
committed by Mis012
parent 4ecd541c6c
commit 1309eb223a
1 changed files with 55 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/api-impl-jni/app/android_app_Activity.c
View File

@@ -189,10 +189,40 @@ JNIEXPORT void JNICALL Java_android_app_Activity_nativeOpenURI(JNIEnv *env, jcla
extern GtkWindow *window; // TODO: get this in a better way extern GtkWindow *window; // TODO: get this in a better way
struct filechooser_callback_data { jobject activity; jint request_code; }; struct filechooser_callback_data { jobject activity; jint request_code; jint action; };
#define RESULT_OK -1 #define RESULT_OK -1
#define RESULT_CANCELED 0 #define RESULT_CANCELED 0
#if GTK_CHECK_VERSION(4, 10, 0)
static void file_dialog_callback(GObject* source_object, GAsyncResult* res, gpointer data) {
struct filechooser_callback_data *d = data;
GtkFileDialog *dialog = GTK_FILE_DIALOG(source_object);
GFile *(*const finish_functions[])(GtkFileDialog *, GAsyncResult *, GError **) = {
gtk_file_dialog_open_finish,
gtk_file_dialog_save_finish,
gtk_file_dialog_select_folder_finish,
};
GFile *file = finish_functions[d->action](dialog, res, NULL);
JNIEnv *env = get_jni_env();
jmethodID fileChooserResultCallback = _METHOD(handle_cache.activity.class, "fileChooserResultCallback", "(IIILjava/lang/String;)V");
if (file) {
char *uri = g_file_get_uri(file);
(*env)->CallVoidMethod(env, d->activity, fileChooserResultCallback, d->request_code, RESULT_OK, d->action, _JSTRING(uri));
if ((*env)->ExceptionCheck(env))
(*env)->ExceptionDescribe(env);
g_free(uri);
g_object_unref(file);
} else {
(*env)->CallVoidMethod(env, d->activity, fileChooserResultCallback, d->request_code, RESULT_CANCELED, d->action, NULL);
}
free(d);
}
#else
static void on_filechooser_response(GtkNativeDialog *native, int response, struct filechooser_callback_data *data) static void on_filechooser_response(GtkNativeDialog *native, int response, struct filechooser_callback_data *data)
{ {
JNIEnv *env = get_jni_env(); JNIEnv *env = get_jni_env();
@@ -218,29 +248,53 @@ static void on_filechooser_response(GtkNativeDialog *native, int response, struc
_UNREF(data->activity); _UNREF(data->activity);
free(data); free(data);
} }
#endif
JNIEXPORT void JNICALL Java_android_app_Activity_nativeFileChooser(JNIEnv *env, jobject this, jint action, jstring type_jstring, jstring filename_jstring, jint request_code) JNIEXPORT void JNICALL Java_android_app_Activity_nativeFileChooser(JNIEnv *env, jobject this, jint action, jstring type_jstring, jstring filename_jstring, jint request_code)
{ {
const char *chooser_title = ((char *[]){"Open File", "Save File", "Select Folder"})[action]; const char *chooser_title = ((char *[]){"Open File", "Save File", "Select Folder"})[action];
#if GTK_CHECK_VERSION(4, 10, 0)
GtkFileDialog *dialog = gtk_file_dialog_new();
gtk_file_dialog_set_title(GTK_FILE_DIALOG(dialog), chooser_title);
#else
GtkFileChooserNative *native = gtk_file_chooser_native_new(chooser_title, window, action, NULL, NULL); GtkFileChooserNative *native = gtk_file_chooser_native_new(chooser_title, window, action, NULL, NULL);
#endif
const char *type = type_jstring ? (*env)->GetStringUTFChars(env, type_jstring, NULL) : NULL; const char *type = type_jstring ? (*env)->GetStringUTFChars(env, type_jstring, NULL) : NULL;
if (type) { if (type) {
GtkFileFilter *filter = gtk_file_filter_new(); GtkFileFilter *filter = gtk_file_filter_new();
gtk_file_filter_add_mime_type(filter, type); gtk_file_filter_add_mime_type(filter, type);
gtk_file_filter_set_name(filter, type); gtk_file_filter_set_name(filter, type);
#if GTK_CHECK_VERSION(4, 10, 0)
gtk_file_dialog_set_default_filter(GTK_FILE_DIALOG(dialog), filter);
#else
gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(native), filter); gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(native), filter);
#endif
(*env)->ReleaseStringUTFChars(env, type_jstring, type); (*env)->ReleaseStringUTFChars(env, type_jstring, type);
} }
const char *filename = filename_jstring ? (*env)->GetStringUTFChars(env, filename_jstring, NULL) : NULL; const char *filename = filename_jstring ? (*env)->GetStringUTFChars(env, filename_jstring, NULL) : NULL;
if (filename) { if (filename) {
#if GTK_CHECK_VERSION(4, 10, 0)
gtk_file_dialog_set_initial_name(GTK_FILE_DIALOG(dialog), filename);
#else
gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(native), filename); gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(native), filename);
#endif
(*env)->ReleaseStringUTFChars(env, filename_jstring, filename); (*env)->ReleaseStringUTFChars(env, filename_jstring, filename);
} }
struct filechooser_callback_data *callback_data = malloc(sizeof(struct filechooser_callback_data)); struct filechooser_callback_data *callback_data = malloc(sizeof(struct filechooser_callback_data));
callback_data->activity = _REF(this); callback_data->activity = _REF(this);
callback_data->request_code = request_code; callback_data->request_code = request_code;
callback_data->action = action;
#if GTK_CHECK_VERSION(4, 10, 0)
void (* const file_dialog_functions[])(GtkFileDialog *, GtkWindow *, GCancellable *, GAsyncReadyCallback, gpointer) = {
gtk_file_dialog_open,
gtk_file_dialog_save,
gtk_file_dialog_select_folder,
};
file_dialog_functions[action](dialog, window, NULL, file_dialog_callback, callback_data);
#else
g_signal_connect (native, "response", G_CALLBACK(on_filechooser_response), callback_data); g_signal_connect (native, "response", G_CALLBACK(on_filechooser_response), callback_data);
gtk_native_dialog_show (GTK_NATIVE_DIALOG (native)); gtk_native_dialog_show (GTK_NATIVE_DIALOG (native));
#endif
} }